diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 339dfd838a4..c15724ccde7 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -528,7 +528,7 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
     (goto-char calc-edit-top)
     (if (buffer-modified-p)
 	(eval calc-edit-handler))
-    (if one-window
+    (if (and one-window (not (one-window-p t)))
 	(delete-window))
     (if (get-buffer-window return)
 	(select-window (get-buffer-window return))