diff --git a/src/ChangeLog b/src/ChangeLog
index 3b8dfe011ee..32b0eb209c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* window.c (Fset_window_start): Compare `w', not `window' because
+	`w' might not be equal to `window' after call to decode_live_window.
+
 2013-08-12  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* process.c (deactivate_process): Reset fds to -1 (Bug#15035).
diff --git a/src/window.c b/src/window.c
index 47a7b58ba9b..be009d37810 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1612,7 +1612,7 @@ overriding motion of point in order to display at this exact start.  */)
   if (NILP (noforce))
     w->force_start = 1;
   w->update_mode_line = 1;
-  if (!EQ (window, selected_window))
+  if (w != XWINDOW (selected_window))
     /* Enforce full redisplay.  FIXME: make it more selective.  */
     windows_or_buffers_changed++;