Index: eog-window.c
===================================================================
--- eog-window.c	(revision 3716)
+++ eog-window.c	(working copy)
@@ -125,6 +125,7 @@ struct _EogWindowPrivate {
         GtkWidget           *layout;
         GtkWidget           *cbox;
         GtkWidget           *view;
+        GtkWidget           *frame;
         GtkWidget           *thumbview;
         GtkWidget           *statusbar;
         GtkWidget           *nav;
@@ -417,7 +418,7 @@ eog_window_collection_mode_changed_cb (G
 	priv->collection_position = position;
 	priv->collection_resizable = resizable;
 
-	frame = priv->view->parent;
+	frame = priv->frame;
 
 	g_object_ref (frame);
 	g_object_ref (priv->nav);
@@ -1856,7 +1857,7 @@ eog_window_run_fullscreen (EogWindow *wi
 	g_assert (GTK_IS_WIDGET (menubar));
 	gtk_widget_hide (menubar);
 
-	g_object_set (G_OBJECT (gtk_widget_get_parent (priv->view)),
+	g_object_set (G_OBJECT (priv->frame),
 		      "shadow-type", GTK_SHADOW_NONE,
 		      NULL);
 
@@ -1895,6 +1896,9 @@ eog_window_run_fullscreen (EogWindow *wi
 
 	gtk_widget_grab_focus (window->priv->view);
 
+	gtk_widget_hide (window->priv->frame);
+	gtk_widget_reparent (window->priv->view, window->priv->layout);
+
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	eog_window_update_fullscreen_popup (window);
 
@@ -1926,7 +1930,7 @@ eog_window_stop_fullscreen (EogWindow *w
 		slideshow_clear_timeout (window);
 	}
 	
-	g_object_set (G_OBJECT (gtk_widget_get_parent (priv->view)),
+	g_object_set (G_OBJECT (priv->frame),
 		      "shadow-type", GTK_SHADOW_IN,
 		      NULL);
 
@@ -1946,6 +1950,8 @@ eog_window_stop_fullscreen (EogWindow *w
 	
 	eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view), FALSE);
 
+	gtk_widget_reparent (window->priv->view, window->priv->frame);
+	gtk_widget_show (window->priv->frame);
 	gtk_window_unfullscreen (GTK_WINDOW (window));
 
 	if (slideshow) {
@@ -3461,13 +3467,13 @@ eog_window_construct_ui (EogWindow *wind
 			  G_CALLBACK (view_zoom_changed_cb), 
 			  window);
 
-	frame = gtk_widget_new (GTK_TYPE_FRAME, 
+	priv->frame = gtk_widget_new (GTK_TYPE_FRAME, 
 				"shadow-type", GTK_SHADOW_IN, 
 				NULL);
 
-	gtk_container_add (GTK_CONTAINER (frame), priv->view);
+	gtk_container_add (GTK_CONTAINER (priv->frame), priv->view);
 
-	gtk_box_pack_start_defaults (GTK_BOX (priv->layout), frame);
+	gtk_box_pack_start_defaults (GTK_BOX (priv->layout), priv->frame);
 
 	priv->thumbview = eog_thumb_view_new ();
 
