diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index fbbec86..a50761e 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -42,9 +42,9 @@ const Action ACTION_FILE_NEW_PROJECT = new Action(IDEActions.FileNewProject, "ME
 const Action ACTION_FILE_NEW_WORKSPACE = new Action(IDEActions.FileNewWorkspace, "MENU_FILE_NEW_WORKSPACE"c);
 const Action ACTION_FILE_OPEN = new Action(IDEActions.FileOpen, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag.Control);
 const Action ACTION_FILE_OPEN_WORKSPACE = new Action(IDEActions.FileOpenWorkspace, "MENU_FILE_OPEN_WORKSPACE"c, null, KeyCode.KEY_O, KeyFlag.Control | KeyFlag.Shift);
-const Action ACTION_FILE_SAVE = new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control);
-const Action ACTION_FILE_SAVE_AS = new Action(IDEActions.FileSaveAs, "MENU_FILE_SAVE_AS"c);
-const Action ACTION_FILE_SAVE_ALL = new Action(IDEActions.FileSaveAll, "MENU_FILE_SAVE_ALL"c, null, KeyCode.KEY_S, KeyFlag.Control | KeyFlag.Shift);
+const Action ACTION_FILE_SAVE = (new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control)).disableByDefault();
+const Action ACTION_FILE_SAVE_AS = (new Action(IDEActions.FileSaveAs, "MENU_FILE_SAVE_AS"c)).disableByDefault();
+const Action ACTION_FILE_SAVE_ALL = (new Action(IDEActions.FileSaveAll, "MENU_FILE_SAVE_ALL"c, null, KeyCode.KEY_S, KeyFlag.Control | KeyFlag.Shift)).disableByDefault();
 const Action ACTION_FILE_EXIT = new Action(IDEActions.FileExit, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag.Alt);
 const Action ACTION_WORKSPACE_BUILD = new Action(IDEActions.BuildWorkspace, "MENU_BUILD_WORKSPACE_BUILD"c);
 const Action ACTION_WORKSPACE_REBUILD = new Action(IDEActions.RebuildWorkspace, "MENU_BUILD_WORKSPACE_REBUILD"c);
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index e931bf3..7ab7902 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -156,6 +156,11 @@ class IDEFrame : AppFrame {
         }
     }
 
+    // returns DSourceEdit from currently active tab (if it's editor), null if current tab is not editor or no tabs open
+    DSourceEdit currentEditor() {
+        return cast(DSourceEdit)_tabs.selectedTabBody();
+    }
+
     /// close tab w/o confirmation
     void closeTab(string tabId) {
         _wsPanel.selectItem(null);
@@ -340,23 +345,12 @@ class IDEFrame : AppFrame {
         tb.addButtons(ACTION_DEBUG_START);
         ToolBarComboBox cbBuildConfiguration = new ToolBarComboBox("buildConfig", ["Debug"d, "Release"d, "Unittest"d]);
         cbBuildConfiguration.onItemClickListener = delegate(Widget source, int index) {
-            if (currentWorkspace) {
-                switch(index) {
-                    case 0:
-                        currentWorkspace.buildConfiguration = BuildConfiguration.Debug;
-                        break;
-                    case 1:
-                        currentWorkspace.buildConfiguration = BuildConfiguration.Release;
-                        break;
-                    case 2:
-                        currentWorkspace.buildConfiguration = BuildConfiguration.Unittest;
-                        break;
-                    default:
-                        break;
-                }
+            if (currentWorkspace && index < 3) {
+                currentWorkspace.buildConfiguration = [BuildConfiguration.Debug, BuildConfiguration.Release, BuildConfiguration.Unittest][index];
             }
             return true;
         };
+        cbBuildConfiguration.action = ACTION_PROJECT_BUILD;
         tb.addControl(cbBuildConfiguration);
         tb.addButtons(ACTION_PROJECT_BUILD);
 
@@ -366,6 +360,46 @@ class IDEFrame : AppFrame {
         return res;
     }
 
+	/// override to handle specific actions state (e.g. change enabled state for supported actions)
+	override bool handleActionStateRequest(const Action a) {
+        switch (a.id) {
+            case IDEActions.FileExit:
+            case IDEActions.FileOpen:
+            case IDEActions.WindowCloseAllDocuments:
+            case IDEActions.FileOpenWorkspace:
+                // disable when background operation in progress
+                if (!_currentBackgroundOperation)
+                    a.state = ACTION_STATE_ENABLED;
+                else
+                    a.state = ACTION_STATE_DISABLE;
+                return true;
+            case IDEActions.HelpAbout:
+            case StandardAction.OpenUrl:
+                // always enabled
+                a.state = ACTION_STATE_ENABLED;
+                return true;
+            case IDEActions.BuildProject:
+            case IDEActions.BuildWorkspace:
+            case IDEActions.RebuildProject:
+            case IDEActions.RebuildWorkspace:
+            case IDEActions.CleanProject:
+            case IDEActions.CleanWorkspace:
+            case IDEActions.DebugStart:
+            case IDEActions.DebugStartNoDebug:
+            case IDEActions.DebugContinue:
+            case IDEActions.UpdateProjectDependencies:
+            case IDEActions.RefreshProject:
+                // enable when project exists
+                if (currentWorkspace && currentWorkspace.startupProject && !_currentBackgroundOperation)
+                    a.state = ACTION_STATE_ENABLED;
+                else
+                    a.state = ACTION_STATE_DISABLE;
+                return true;
+            default:
+                return super.handleActionStateRequest(a);
+        }
+	}
+
     /// override to handle specific actions
 	override bool handleAction(const Action a) {
         if (a) {
@@ -399,31 +433,25 @@ class IDEFrame : AppFrame {
                 case IDEActions.BuildProject:
                 case IDEActions.BuildWorkspace:
                     buildProject(BuildOperation.Build);
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.RebuildProject:
                 case IDEActions.RebuildWorkspace:
                     buildProject(BuildOperation.Rebuild);
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.CleanProject:
                 case IDEActions.CleanWorkspace:
                     buildProject(BuildOperation.Clean);
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.DebugStart:
                 case IDEActions.DebugStartNoDebug:
                 case IDEActions.DebugContinue:
                     buildProject(BuildOperation.Run);
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.UpdateProjectDependencies:
                     buildProject(BuildOperation.Upgrade);
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.RefreshProject:
                     refreshWorkspace();
-                    //setBackgroundOperation(new BackgroundOperationWatcherTest(this));
                     return true;
                 case IDEActions.WindowCloseAllDocuments:
                     askForUnsavedEdits(delegate() {
@@ -534,7 +562,8 @@ class IDEFrame : AppFrame {
         closeAllDocuments();
         currentWorkspace = ws;
         _wsPanel.workspace = ws;
-        if (ws.startupProject && ws.startupProject.mainSourceFile) {
+        requestActionsUpdate();
+        if (ws && ws.startupProject && ws.startupProject.mainSourceFile) {
             openSourceFile(ws.startupProject.mainSourceFile.filename);
             _tabs.setFocus();
         }