diff --git a/gui/graph_view.c b/gui/graph_view.c
index fecacf92..5a3cb8ee 100644
--- a/gui/graph_view.c
+++ b/gui/graph_view.c
@@ -165,6 +165,10 @@ void destroy_view(graph_view_handle view)
   {
     world_tree_activate((graph_view_handle)list_entry(g_views.next, struct graph_view, siblings));
   }
+  else
+  {
+    set_main_window_title(NULL);
+  }
 
   detach_canvas(view_ptr);
 
diff --git a/gui/main.c b/gui/main.c
index 3734f6a4..6eb538ce 100644
--- a/gui/main.c
+++ b/gui/main.c
@@ -571,9 +571,18 @@ void
 set_main_window_title(
   graph_view_handle view)
 {
-  char * title = catdup(get_view_name(view), " - LADI Session Handler");
-  gtk_window_set_title(GTK_WINDOW(g_main_win), title);
-  free(title);
+  char * title;
+
+  if (view != NULL)
+  {
+    title = catdup(get_view_name(view), " - LADI Session Handler");
+    gtk_window_set_title(GTK_WINDOW(g_main_win), title);
+    free(title);
+  }
+  else
+  {
+    gtk_window_set_title(GTK_WINDOW(g_main_win), "LADI Session Handler");
+  }
 }
 
 static