diff --git a/lib/awful/prompt.lua.in b/lib/awful/prompt.lua.in
index c398fc94..d552c1a8 100644
--- a/lib/awful/prompt.lua.in
+++ b/lib/awful/prompt.lua.in
@@ -211,6 +211,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
         -- Get out cases
         if (mod.Control and (key == "c" or key == "g"))
             or (not mod.Control and key == "Escape") then
+            capi.keygrabber.stop()
             textbox:set_markup("")
             if done_callback then done_callback() end
             return false