diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index e47e196..17909fa 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -628,22 +628,26 @@ _content_get(void *data, Evas_Object *obj, const char *source)
         evas_object_show(ic);
         elm_table_pack(table, ic, 2, 0, 1, 1);
 
-        if (code && *code == EDI_SCM_STATUS_UNTRACKED)
+        if (staged)
           {
-             elm_object_tooltip_text_set(box, _("Untracked changes"));
+             ic = elm_icon_add(table);
+             elm_icon_standard_set(ic, "dialog-information");
+             evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
+             evas_object_show(ic);
+             elm_table_pack(table, ic, 3, 0, 1, 1);
+             elm_object_tooltip_text_set(box, _("Staged changes"));
           }
-        else if (!staged)
+        else
           {
              ic = elm_icon_add(table);
              elm_icon_standard_set(ic, "dialog-error");
              evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
              evas_object_show(ic);
              elm_table_pack(table, ic, 3, 0, 1, 1);
-             elm_object_tooltip_text_set(box, _("Unstaged changes"));
-          }
-        else
-          {
-             elm_object_tooltip_text_set(box, _("Staged changes"));
+             if (*code != EDI_SCM_STATUS_UNTRACKED)
+               elm_object_tooltip_text_set(box, _("Unstaged changes"));
+             else
+               elm_object_tooltip_text_set(box, _("Untracked changes"));
           }
      }