diff --git a/src/lib/extensions/focus_inspector/gui.c b/src/lib/extensions/focus_inspector/gui.c
index 03f817f..3289f64 100644
--- a/src/lib/extensions/focus_inspector/gui.c
+++ b/src/lib/extensions/focus_inspector/gui.c
@@ -109,6 +109,8 @@ ui_managers_add(Instance *inst, Clouseau_Focus_Managers *clouseau_managers)
 
    elm_genlist_clear(managers);
 
+   if (!clouseau_managers) return;
+
    EINA_LIST_FOREACH(clouseau_managers->managers, n, it)
      {
         elm_genlist_item_append(managers, itc, it, NULL, 0, _sel, inst);
@@ -145,6 +147,8 @@ ui_manager_data_arrived(Instance *inst, Clouseau_Focus_Manager_Data *data)
 
    elm_hoversel_clear(history);
 
+   if (!data) return;
+
    EINA_LIST_FOREACH(data->relations, n, rel)
      {
         if (rel->relation.position_in_history != -1)
diff --git a/src/lib/extensions/focus_inspector/main.c b/src/lib/extensions/focus_inspector/main.c
index 19545f6..391e90e 100644
--- a/src/lib/extensions/focus_inspector/main.c
+++ b/src/lib/extensions/focus_inspector/main.c
@@ -65,10 +65,18 @@ _session_changed(Clouseau_Extension *ext)
         eina_debug_session_data_set(ext->session, ext);
         eina_debug_opcodes_register(ext->session, ops, NULL, ext);
      }
+
+   ui_managers_add(ext->data, NULL);
+   ui_manager_data_arrived(ext->data, NULL);
+
 }
+
 static void
 _app_changed(Clouseau_Extension *ext)
 {
+   ui_managers_add(ext->data, NULL);
+   ui_manager_data_arrived(ext->data, NULL);
+
    com_refresh_managers(ext->data);
 }