Index: uspace/app/nav/nav.c
===================================================================
--- uspace/app/nav/nav.c	(revision 552b69f240ec8edc47b2b988d0b23e54621bbde0)
+++ uspace/app/nav/nav.c	(revision bad765aeead3c3c8a80a051d57b663e07ef71cf2)
@@ -230,13 +230,17 @@
 
 	for (i = 0; i < 2; i++) {
-		ui_fixed_remove(navigator->fixed,
-		    panel_ctl(navigator->panel[i]));
-		panel_destroy(navigator->panel[i]);
-	}
-
-	ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));
-
-	if (navigator->menu != NULL)
+		if (navigator->panel[i] != NULL) {
+			ui_fixed_remove(navigator->fixed,
+			    panel_ctl(navigator->panel[i]));
+			panel_destroy(navigator->panel[i]);
+		}
+	}
+
+
+	if (navigator->menu != NULL) {
+		ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));
 		nav_menu_destroy(navigator->menu);
+	}
+
 	if (navigator->window != NULL)
 		ui_window_destroy(navigator->window);