diff --git a/CHANGES.md b/CHANGES.md
index 1bd458bc3..68f6078bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -269,6 +269,9 @@
       to cycle through the completions backwards. This is bound to
       `S-<TAB>` by default.
 
+    - The `vimLikeXPKeymap` now accepts the prompt upon pressing enter
+      in normal mode.
+
   * `XMonad.Actions.Prefix`
 
     - Added `orIfPrefixed`, a combinator to decide upon an action based
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs
index a403c5998..800d8f9cf 100644
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -1138,6 +1138,8 @@ vimLikeXPKeymap' fromColor promptF pasteFilter notWord = M.fromList $
         , (xK_c,            promptSubmap (setModeDone True) changeVimXPKeymap
                                 >> setModeDone True
           )
+        , (xK_Return,       acceptSelection)
+        , (xK_KP_Enter,     acceptSelection)
         ] ++
         map (first $ (,) shiftMask)
         [ (xK_dollar,       endOfLine >> moveCursor Prev)