diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c712e023c2a..d5417a8c2c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (window--state-get-1): Workaround for bug#14527.
+	http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html
+
 2013-06-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/eww.el (eww-back-url): Implement the history by stashing all
diff --git a/lisp/window.el b/lisp/window.el
index 5b001988ddf..5ba32bac953 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4258,7 +4258,8 @@ specific buffers."
             (total-width . ,(window-total-size window t))
             (normal-height . ,(window-normal-size window))
             (normal-width . ,(window-normal-size window t))
-            (combination-limit . ,(window-combination-limit window))
+            ,@(unless (window-live-p window)
+                `(combination-limit . ,(window-combination-limit window)))
             ,@(let ((parameters (window-parameters window))
 		    list)
 		;; Make copies of those window parameters whose