diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 8bac3705e..31e8198cd 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1174,6 +1174,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = Zotero.Promise.coroutine(f
 		fieldIndexPromise, citationsByItemIDPromise, previewFn
 	);
 	
+	Zotero.debug('Integration: Displaying citation dialogue');
 	if (Zotero.Prefs.get("integration.useClassicAddCitationDialog")) {
 		Zotero.Integration.displayDialog('chrome://zotero/content/integration/addCitationDialog.xul',
 			'alwaysRaised,resizable', io);
@@ -1350,24 +1351,11 @@ Zotero.Integration.Session.prototype.init = Zotero.Promise.coroutine(function *(
 				Zotero.debug("Integration: No document preferences found, but found "+data.prefs.fieldType+" fields");
 			}
 		}
-
-		if (haveFields && !Object.keys(this.citationsByIndex).length) {
-			// We should load up the fields on the first interaction with the document, so
-			// that we can display a list of existing citations, etc.
-			yield this.fields.get();
-			yield this.fields.updateSession(FORCE_CITATIONS_FALSE);
-		}
 		
 		if (dontRunSetDocPrefs) return false;
 		
 		yield this.setDocPrefs();
 	}
-	if (!Object.keys(this.citationsByIndex).length) {
-		// We should load up the fields on the first interaction with the document, so
-		// that we can display a list of existing citations, etc.
-		yield this.fields.get();
-		yield this.fields.updateSession(FORCE_CITATIONS_FALSE);
-	}
 	return true;
 });