diff --git a/lua/cmp/init.lua b/lua/cmp/init.lua
index bce4336..83970ab 100644
--- a/lua/cmp/init.lua
+++ b/lua/cmp/init.lua
@@ -277,6 +277,23 @@ autocmd.subscribe('InsertEnter', function()
   end)
 end)
 
+autocmd.subscribe('InsertLeave', function()
+  cmp.core:reset()
+  cmp.core.view:close()
+end)
+
+autocmd.subscribe('CmdlineEnter', function()
+  if config.enabled() then
+    cmp.core:prepare()
+    cmp.core:on_change('InsertEnter')
+  end
+end)
+
+autocmd.subscribe('CmdlineLeave', function()
+  cmp.core:reset()
+  cmp.core.view:close()
+end)
+
 autocmd.subscribe('TextChanged', function()
   if config.enabled() then
     cmp.core:on_change('TextChanged')
@@ -289,11 +306,6 @@ autocmd.subscribe('CursorMoved', function()
   end
 end)
 
-autocmd.subscribe('InsertLeave', function()
-  cmp.core:reset()
-  cmp.core.view:close()
-end)
-
 cmp.event:on('confirm_done', function(e)
   cmp.config.compare.recently_used:add_entry(e)
 end)
diff --git a/plugin/cmp.lua b/plugin/cmp.lua
index 7e6174e..268bd04 100644
--- a/plugin/cmp.lua
+++ b/plugin/cmp.lua
@@ -37,7 +37,7 @@ misc.set(_G, { 'cmp', 'plugin', 'cmdline', 'enter' }, function()
           autocmd CmdlineChanged * lua require'cmp.utils.autocmd'.emit('TextChanged')
         augroup END
       ]]
-      require('cmp.utils.autocmd').emit('InsertEnter')
+      require('cmp.utils.autocmd').emit('CmdlineEnter')
     end
   end
 end)
@@ -53,7 +53,7 @@ misc.set(_G, { 'cmp', 'plugin', 'cmdline', 'leave' }, function()
         autocmd!
       augroup END
     ]]
-    require('cmp.utils.autocmd').emit('InsertLeave')
+    require('cmp.utils.autocmd').emit('CmdlineLeave')
   end
 end)