diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index fb1b0c08..1e860c37 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -673,8 +673,11 @@ appropriate flag at the message forwarded or replied-to."
   "Wrapper around `message-kill-buffer'.
 It restores mu4e window layout after killing the compose-buffer."
   (interactive)
-  (let ((current-buffer (current-buffer)))
+  (let ((current-buffer (current-buffer))
+        (win (selected-window)))
     (message-kill-buffer)
+    (when (window-live-p win)
+      (delete-window win))
     ;; Compose buffer killed
     (when (not (equal current-buffer (current-buffer)))
       ;; Restore mu4e
diff --git a/mu4e/mu4e-window.el b/mu4e/mu4e-window.el
index 95e95363..14d60c17 100644
--- a/mu4e/mu4e-window.el
+++ b/mu4e/mu4e-window.el
@@ -214,7 +214,7 @@ being created if CREATE is non-nil."
         ;; we'll generate a new, unique name.
         (when (and (buffer-live-p buffer) (mu4e--view-detached-p buffer))
           (setq buffer (generate-new-buffer-name buffer-name)))
-        (when (or (not (buffer-live-p buffer)) create)
+        (when (and (not (buffer-live-p buffer)) create)
           (setq buffer (get-buffer-create (or buffer buffer-name)))
           (with-current-buffer buffer
             (mu4e-view-mode))))