diff --git a/ChangeLog b/ChangeLog
index 5f0bab0482..6670d8dc20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell.c (gimp_display_shell_reconnect):
+	emit "reconnect" *before* emitting scale and scroll events so
+	listeners (the navigation view) can switch to the new image at the
+	right time.
+
 2004-07-28  Sven Neumann  <sven@gimp.org>
 
 	Applied a patch from Brion Vibber that makes the TWAIN plug-in
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 123a004178..0b01bc6938 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -981,11 +981,11 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
 
   gimp_display_shell_connect (shell);
 
+  g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
+
   gimp_display_shell_scale_setup (shell);
   gimp_display_shell_expose_full (shell);
   gimp_display_shell_scaled (shell);
-
-  g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
 }
 
 void