diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 24ed3f01..0379939f 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -368,13 +368,15 @@ after the end of the search results."
 
       (define-key map "s" 'mu4e-headers-search)
       (define-key map "S" 'mu4e-headers-search-edit)
-      (define-key map "/" 'mu4e-headers-search-narrow)
 
+      (define-key map "/" 'mu4e-headers-search-narrow)
+            
       (define-key map "j" 'mu4e~headers-jump-to-maildir)
 
       (define-key map (kbd "<M-left>")  'mu4e-headers-query-prev)
+      (define-key map (kbd "\\")        'mu4e-headers-query-prev)
       (define-key map (kbd "<M-right>") 'mu4e-headers-query-next)
-
+      
       (define-key map "b" 'mu4e-headers-search-bookmark)
       (define-key map "B" 'mu4e-headers-search-bookmark-edit)
 
@@ -1086,8 +1088,9 @@ determines where the query is taken from and is a symbol, either
 `future' or `past'."
   (let ((query (mu4e~headers-pop-query whence))
 	 (where (if (eq whence 'future) 'past 'future)))
-    (mu4e~headers-push-query mu4e~headers-last-query where)
-    (mu4e-headers-search query nil nil t)))
+    (when query
+      (mu4e~headers-push-query mu4e~headers-last-query where)
+      (mu4e-headers-search query nil nil t))))
 
 (defun mu4e-headers-query-next ()
   "Execute the previous query from the query stacks."
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index deb15be8..df4b5b97 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -1269,8 +1269,8 @@ shortcut @key{m}); so, for example, if you want to move a message the
 @subsection Navigating through search queries
 You can navigate through previous/next queries using
 @code{mu4e-headers-query-prev} and @code{mu4e-headers-query-next}, which are
-bound to @key{M-left} and @key{M-right}, just like the way you can navigate to
-previous and next pages in many webbrowsers.
+bound, respectively, to @key{M-left} and @key{M-right}, just like the way you
+can navigate to previous and next pages in many web browsers.
 
 The functions try to be smart as to not record duplicate queries. Also, the
 number of queries remembered has a fixed limit, so long-running @t{mu4e} won't
@@ -1294,7 +1294,9 @@ attachments.
 Now, @code{mu4e-headers-search-narrow} (@key{/}) comes in handy. That function
 asks for an additional search pattern, which will be appended to the current
 search query, in effect getting you the subset of the currently shown headers
-that also match this extra search pattern.
+that also match this extra search pattern. @key{\} takes you back to the
+previous query, so, effectively 'widens' the search if you have just narrowed
+it.
 
 Technically, narrowing the results of query @t{x} with expression @t{y}
 implies doing a search @t{(x) AND y}.