diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 2d9d7e5..ea9bdfd 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -596,8 +596,6 @@ _edi_icon_update()
 
    can_undo = edi_mainview_can_undo();
    can_redo = edi_mainview_can_redo();
-   can_scm = edi_scm_enabled();
-   can_remote = can_scm && edi_scm_remote_enabled();
    modified = edi_mainview_modified();
 
    elm_object_item_disabled_set(_edi_menu_save, !modified);
@@ -611,6 +609,9 @@ _edi_icon_update()
 
    if (edi_project_mode_get())
      {
+        can_scm = edi_scm_enabled();
+        can_remote = can_scm && edi_scm_remote_enabled();
+
         elm_object_item_disabled_set(_edi_menu_init, can_scm);
         elm_object_item_disabled_set(_edi_menu_push, !can_remote);
         elm_object_item_disabled_set(_edi_menu_pull, !can_remote);
@@ -794,6 +795,7 @@ static void
 _edi_build_menu_items_disabled_set(Eina_Bool state)
 {
    if (!edi_project_mode_get()) return;
+
    elm_object_disabled_set(_edi_toolbar_build, state);
    elm_object_disabled_set(_edi_toolbar_test, state);
    elm_object_item_disabled_set(_edi_menu_build, state);
diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index 69bd579..cffe2c3 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -905,6 +905,9 @@ edi_settings_show(Evas_Object *mainwin, Edi_Settings_Tab type)
    Evas_Object *win, *bg, *table, *naviframe, *tb;
    Elm_Object_Item *tb_it, *default_it;
    Elm_Object_Item *it_project, *it_display, *it_behaviour, *it_builds;
+   Eina_Bool project_mode;
+
+   it_project = it_display = it_behaviour = it_builds = NULL;
 
    if (edi_settings_win_get())
      return NULL;
@@ -957,9 +960,13 @@ edi_settings_show(Evas_Object *mainwin, Edi_Settings_Tab type)
                                                    _edi_settings_behaviour_create(naviframe), NULL);
    elm_naviframe_item_title_enabled_set(_edi_settings_behaviour, EINA_FALSE, EINA_FALSE);
 
-   it_project = elm_toolbar_item_append(tb, "applications-development", _("Project"),_edi_settings_category_cb, _edi_settings_project);
+   project_mode = edi_project_mode_get();
+
+   if (project_mode)
+     it_project = elm_toolbar_item_append(tb, "applications-development", _("Project"),_edi_settings_category_cb, _edi_settings_project);
    it_display = elm_toolbar_item_append(tb, "preferences-desktop", _("Display"), _edi_settings_category_cb, _edi_settings_display);
-   it_builds = elm_toolbar_item_append(tb, "system-run", _("Builds"), _edi_settings_category_cb, _edi_settings_builds);
+   if (project_mode)
+     it_builds = elm_toolbar_item_append(tb, "system-run", _("Builds"), _edi_settings_category_cb, _edi_settings_builds);
 
    tb_it = elm_toolbar_item_append(tb, NULL, NULL, NULL, NULL);
    elm_toolbar_item_separator_set(tb_it, EINA_TRUE);
@@ -985,7 +992,8 @@ edi_settings_show(Evas_Object *mainwin, Edi_Settings_Tab type)
           break;
      }
 
-   elm_toolbar_item_selected_set(default_it, EINA_TRUE);
+   if (default_it)
+     elm_toolbar_item_selected_set(default_it, EINA_TRUE);
 
    evas_object_show(naviframe);
    evas_object_resize(win, 480 * elm_config_scale_get(), 360 * elm_config_scale_get());