diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
index 716fd2ee9d..a128ecacb5 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
@@ -91,8 +91,8 @@ define [
 					else
 						editor.setOption('behavioursEnabled', false)
 
-				window.editors ||= []
-				window.editors.push editor
+				window._debug_editors ||= []
+				window._debug_editors.push editor
 
 				scope.name = attrs.aceEditor
 
@@ -428,7 +428,10 @@ define [
 						rendererData.lineHeight = editor.renderer.lineHeight
 
 				scope.$on '$destroy', () ->
-					detachFromAce(scope.sharejsDoc)
+					if scope.sharejsDoc?
+						detachFromAce(scope.sharejsDoc)
+
+				scope.$emit "#{scope.name}:inited", editor
 
 			template: """
 				<div class="ace-editor-wrapper">
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
index db8432bc1e..78d12eebc3 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
@@ -224,7 +224,7 @@ define [
 					#   is likely to end up with `\href{}ref{}`
 					if !data?
 						completions = this.completions
-						popup = editor.completer.popup
+						popup = this.popup
 						data = popup.getData(popup.getRow())
 						data.completer =
 							insertMatch: (editor, matchData) ->