diff --git a/chrome/content/zotero/integration/addCitationDialog.js b/chrome/content/zotero/integration/addCitationDialog.js
index 76495af36..8e7a3128c 100644
--- a/chrome/content/zotero/integration/addCitationDialog.js
+++ b/chrome/content/zotero/integration/addCitationDialog.js
@@ -339,7 +339,9 @@ var Zotero_Citation_Dialog = new function () {
 	 * Shows the edit pane
 	 */
 	function toggleEditor(text) {
+		var warning = document.getElementById('zotero-editor-warning');
 		var editor = document.getElementById('editor');
+		warning.hidden = _previewShown;
 		editor.hidden = _previewShown;
 		_previewShown = !_previewShown;
 		
diff --git a/chrome/content/zotero/integration/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul
index 74d250a92..ff11498b2 100644
--- a/chrome/content/zotero/integration/addCitationDialog.xul
+++ b/chrome/content/zotero/integration/addCitationDialog.xul
@@ -199,5 +199,7 @@
 		</vbox>
 		
 		<textbox id="editor" type="styled" mode="integration" hidden="true" flex="1"/>
+		<!-- TODO: localize -->
+		<description id="zotero-editor-warning" style="margin: 9px 1px 0" hidden="true">Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.</description>
 	</vbox>
 </dialog>
diff --git a/chrome/content/zotero/integration/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul
index d6e0e0907..9f4be1a80 100644
--- a/chrome/content/zotero/integration/editBibliographyDialog.xul
+++ b/chrome/content/zotero/integration/editBibliographyDialog.xul
@@ -115,5 +115,7 @@
 		</vbox>
 		
 		<textbox id="editor" type="styled" mode="integration" flex="1"/>
+		<!-- TODO: localize -->
+		<description id="zotero-editor-warning" style="margin: 9px 1px 0">Warning: If you edit a citation in the editor it will no longer update to reflect changes in your database or the citation style.</description>
 	</vbox>
 </dialog>