diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 272a71088..0a82f9871 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -415,6 +415,17 @@ var ZoteroPane = new function()
 		
 		switch (command) {
 			case 'openZotero':
+				try {
+					// Ignore Cmd-Shift-Z keystroke in text areas
+					if (Zotero.isMac && key == 'Z' &&
+							event.originalTarget.localName == 'textarea') {
+						Zotero.debug('Ignoring keystroke in text area');
+						return;
+					}
+				}
+				catch (e) {
+					Zotero.debug(e);
+				}
 				ZoteroPane.toggleDisplay()
 				break;
 			case 'library':