diff --git a/lib/awful/prompt.lua b/lib/awful/prompt.lua
index 2bf837e92..c3d0f4667 100644
--- a/lib/awful/prompt.lua
+++ b/lib/awful/prompt.lua
@@ -55,6 +55,17 @@
 -- Note that this assumes an `rc.lua` file based on the default one. The way
 -- to access the screen prompt may vary.
 --
+-- **Extra key hooks**:
+--
+-- The Awesome prompt also supports adding custom extensions to specific
+-- keyboard keybindings. Those keybindings have precedence over the built-in
+-- ones. Therefor, they can be used to override the default ones.
+--
+-- *[Example one] Adding pre-configured `awful.spawn` commands:*
+--
+-- @DOC_wibox_awidget_prompt_hooks_EXAMPLE@
+--
+--
 -- @author Julien Danjou <julien@danjou.info>
 -- @copyright 2008 Julien Danjou
 -- @module awful.prompt
diff --git a/tests/examples/wibox/awidget/prompt/hooks.lua b/tests/examples/wibox/awidget/prompt/hooks.lua
new file mode 100644
index 000000000..c8cc268d9
--- /dev/null
+++ b/tests/examples/wibox/awidget/prompt/hooks.lua
@@ -0,0 +1,63 @@
+local parent    = ... --DOC_NO_USAGE --DOC_HIDE
+local wibox     = require( "wibox"     ) --DOC_HIDE
+local awful     = { prompt = require("awful.prompt"),--DOC_HIDE
+                    util   = require("awful.util")}--DOC_HIDE
+local beautiful = require( "beautiful" ) --DOC_HIDE
+
+    local atextbox = wibox.widget.textbox()
+
+    -- Custom handler for the return value. This implementation does nothing,
+    -- but you might want be notified of the failure, so it is part of this
+    -- example.
+    local function clear(result)
+        atextbox.widget.text =
+            type(result) == "string" and result or ""
+    end
+
+    local hooks = {
+        -- Replace the "normal" `Return` with a custom one
+        {{         }, "Return", awful.spawn},
+
+        -- Spawn method to spawn in the current tag
+        {{"Mod1"   }, "Return", function(command)
+            clear(awful.spawn(command,{
+                intrusive = true,
+                tag       = mouse.screen.selected_tag
+            }))
+        end},
+
+        -- Spawn in the current tag as floating and on top
+        {{"Shift"  }, "Return", function(command)
+            clear(awful.spawn(command,{
+                ontop     = true,
+                floating  = true,
+                tag       = mouse.screen.selected_tag
+            }))
+        end},
+
+        -- Spawn in a new tag
+        {{"Control"}, "Return", function(command)
+            clear(awful.spawn(command,{
+                new_tag = true
+            }))
+        end},
+
+        -- Cancel
+        {{         }, "Escape", function(_)
+            clear()
+        end},
+    }
+
+    awful.prompt.run {
+        prompt        = "<b>Run: </b>",
+        hooks         = hooks,
+        textbox       = atextbox,
+        history_path  = awful.util.getdir("cache") .. "/history",
+        done_callback = clear,
+    }
+
+parent:add( wibox.widget {    --DOC_HIDE
+    atextbox,  --DOC_HIDE
+    bg = beautiful.bg_normal,  --DOC_HIDE
+    widget = wibox.container.background  --DOC_HIDE
+}) --DOC_HIDE