diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 748c94c7825..15a94ac23c5 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,5 +10,4 @@
     = render "layouts/header/default", title: header_title
     = render 'layouts/page', sidebar: sidebar, nav: nav
 
-    = render "layouts/init_auto_complete" if current_user && @load_gfm
     = yield :scripts_body
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml
index bc2fc397893..cb97181b9e1 100644
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
@@ -1,4 +1,3 @@
-- @load_gfm = !(@target_project || @project).nil?
 - supports_slash_commands = local_assigns.fetch(:supports_slash_commands, false)
 .zen-backdrop
   - classes << ' js-gfm-input js-autosize markdown-area'
@@ -8,3 +7,6 @@
     = text_area_tag attr, nil, class: classes, placeholder: placeholder
   %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" }
     = icon('compress')
+
+- content_for :scripts_body do
+  = render "layouts/init_auto_complete" if current_user && (@target_project || @project)