diff --git a/lisp/view.el b/lisp/view.el
index 1f6c8f42ac2..ca9ee827f5a 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -582,7 +582,8 @@ corresponding OLD-WINDOW is a live window, then select OLD-WINDOW."
 (defun View-exit-and-edit ()
   "Exit View mode and make the current buffer editable."
   (interactive)
-  (let ((view-old-buffer-read-only nil))
+  (let ((view-old-buffer-read-only nil)
+	(view-no-disable-on-exit nil))
     (view-mode-exit)))
 
 (defun View-leave ()