diff --git a/src/include/ZMap/zmapView.h b/src/include/ZMap/zmapView.h
index 03a002d812a6242936154d3c625f315e5b9d2c15..ebd5f1efbecc579d51186fa4b57c4f10de6302f5 100755
--- a/src/include/ZMap/zmapView.h
+++ b/src/include/ZMap/zmapView.h
@@ -29,9 +29,9 @@
  *              servers.
  *              
  * HISTORY:
- * Last edited: Jul 30 10:49 2007 (rds)
+ * Last edited: Aug  2 12:28 2007 (rds)
  * Created: Thu May 13 14:59:14 2004 (edgrif)
- * CVS info:   $Id: zmapView.h,v 1.45 2007-07-30 11:46:38 rds Exp $
+ * CVS info:   $Id: zmapView.h,v 1.46 2007-08-02 11:50:54 rds Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAPVIEW_H
@@ -139,7 +139,7 @@ void zMapViewInit(ZMapViewCallbacks callbacks) ;
 ZMapViewWindow zMapViewCreate(GtkWidget *xremote_widget, GtkWidget *view_container,
 			      char *sequence, int start, int end,
 			      void *app_data) ;
-void zMapViewSetupNavigator(ZMapView zmap_view, GtkWidget *canvas_widget);
+void zMapViewSetupNavigator(ZMapViewWindow view_window, GtkWidget *canvas_widget);
 ZMapViewWindow zMapViewCopyWindow(ZMapView zmap_view, GtkWidget *parent_widget,
 				  ZMapWindow copy_window, ZMapWindowLockType window_locking) ;
 void zMapViewRemoveWindow(ZMapViewWindow view_window) ;
diff --git a/src/zmapControl/zmapControlViews.c b/src/zmapControl/zmapControlViews.c
index bb9fa5f475d713f4a6a39669d33262a62816f865..569eff2f6c57f53c70ec2d90cb36c1317d5297ed 100755
--- a/src/zmapControl/zmapControlViews.c
+++ b/src/zmapControl/zmapControlViews.c
@@ -29,9 +29,9 @@
  *              
  * Exported functions: See zmapControl.h
  * HISTORY:
- * Last edited: Jul 11 09:08 2007 (edgrif)
+ * Last edited: Aug  2 12:28 2007 (rds)
  * Created: Mon Jan 10 10:38:43 2005 (edgrif)
- * CVS info:   $Id: zmapControlViews.c,v 1.20 2007-07-11 08:11:40 edgrif Exp $
+ * CVS info:   $Id: zmapControlViews.c,v 1.21 2007-08-02 11:46:55 rds Exp $
  *-------------------------------------------------------------------
  */
  
@@ -132,7 +132,7 @@ ZMapView zmapControlNewWindow(ZMap zmap, char *sequence, int start, int end)
       /* Add view to the xremote widget so it can be recovered later. */
       g_object_set_data(G_OBJECT(xremote_widget), VIEW_XREMOTE_WIDGET, zmap_view) ;
 
-      zMapViewSetupNavigator(zmap_view, zmap->nav_canvas) ;
+      zMapViewSetupNavigator(view_window, zmap->nav_canvas) ;
 
       /* Add to hash of viewwindows to frames */
       g_hash_table_insert(zmap->viewwindow_2_parent, view_window, view_container) ;
diff --git a/src/zmapView/zmapView.c b/src/zmapView/zmapView.c
index c96f29fc39a37063673f03eb165c1d8c47b2986d..97be93abcfd0f1586170400c95a048f40babd56f 100755
--- a/src/zmapView/zmapView.c
+++ b/src/zmapView/zmapView.c
@@ -25,9 +25,9 @@
  * Description: 
  * Exported functions: See ZMap/zmapView.h
  * HISTORY:
- * Last edited: Jul 30 12:56 2007 (rds)
+ * Last edited: Aug  2 12:45 2007 (rds)
  * Created: Thu May 13 15:28:26 2004 (edgrif)
- * CVS info:   $Id: zmapView.c,v 1.121 2007-07-31 16:11:17 rds Exp $
+ * CVS info:   $Id: zmapView.c,v 1.122 2007-08-02 11:45:57 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -267,10 +267,19 @@ ZMapViewWindow zMapViewCreate(GtkWidget *xremote_widget, GtkWidget *view_contain
 
 
 
-void zMapViewSetupNavigator(ZMapView zmap_view, GtkWidget *canvas_widget)
+void zMapViewSetupNavigator(ZMapViewWindow view_window, GtkWidget *canvas_widget)
 {
+  ZMapView zmap_view ;
+
+  zMapAssert(view_window) ;
+
+  zmap_view = view_window->parent_view ;
+
   if (zmap_view->state != ZMAPVIEW_DYING)
-    zmap_view->navigator_window = zMapWindowNavigatorCreate(canvas_widget);
+    {
+      zmap_view->navigator_window = zMapWindowNavigatorCreate(canvas_widget);
+      zMapWindowNavigatorSetCurrentWindow(zmap_view->navigator_window, view_window->window);
+    }
 
   return ;
 }
@@ -2229,8 +2238,8 @@ static void justDrawContext(ZMapView view, ZMapFeatureContext diff_context)
    * all the previously drawn features need to move.  It also 
    * negates the need to keep state as to the length of the sequence,
    * the number of times the scale bar has been drawn, etc... */
-  zMapWindowNavigatorSetStrand(view->navigator_window, view->revcomped_features);
   zMapWindowNavigatorReset(view->navigator_window); /* So reset */
+  zMapWindowNavigatorSetStrand(view->navigator_window, view->revcomped_features);
   /* and draw with _all_ the view's features. */
   zMapWindowNavigatorDrawFeatures(view->navigator_window, view->features);