3 files changed, 21 insertions, 27 deletions

diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index 9a95eb2d2..bebf52c08 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -199,12 +199,17 @@ class WebControls extends Component {
             })
           }
           onFocus={event => {
-            console.log('on focus event');
             event.target.select();
             this.setState({
               editUrl: true,
             });
           }}
+          onBlur={event => {
+            event.target.blur();
+            this.setState({
+              editUrl: false,
+            });
+          }}
           onKeyDown={event => {
             if (event.key === 'Enter') {
               this.setState({
@@ -217,7 +222,7 @@ class WebControls extends Component {
                 editUrl: false,
                 inputUrl: url,
               });
-              event.target.blur();
+              this.inputRef.current.blur();
             }
           }}
           ref={this.inputRef}
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index 0ff836cba..c97d4bd9c 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -224,6 +224,7 @@ class EditWorkspaceForm extends Component {
             busy={isSaving}
             buttonType={isSaving ? 'secondary' : 'primary'}
             onClick={this.save.bind(this, form)}
+            // TODO: Need to disable if no services have been added to this workspace
             disabled={isSaving}
           />
         </div>
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 8c73516bc..ec9d7ee7f 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -155,38 +155,26 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _create = async ({ name }) => {
-    // eslint-disable-next-line no-useless-catch
-    try {
-      const workspace = await createWorkspaceRequest.execute(name);
-      await getUserWorkspacesRequest.result.push(workspace);
-      this._edit({ workspace });
-    } catch (error) {
-      throw error;
-    }
+    const workspace = await createWorkspaceRequest.execute(name);
+    await getUserWorkspacesRequest.result.push(workspace);
+    this._edit({ workspace });
   };
 
   @action _delete = async ({ workspace }) => {
-    // eslint-disable-next-line no-useless-catch
-    try {
-      await deleteWorkspaceRequest.execute(workspace);
-      await getUserWorkspacesRequest.result.remove(workspace);
-      this.stores.router.push('/settings/workspaces');
-    } catch (error) {
-      throw error;
+    await deleteWorkspaceRequest.execute(workspace);
+    await getUserWorkspacesRequest.result.remove(workspace);
+    this.stores.router.push('/settings/workspaces');
+    if (this.activeWorkspace === workspace) {
+      this._deactivateActiveWorkspace();
     }
   };
 
   @action _update = async ({ workspace }) => {
-    // eslint-disable-next-line no-useless-catch
-    try {
-      await updateWorkspaceRequest.execute(workspace);
-      // Path local result optimistically
-      const localWorkspace = this._getWorkspaceById(workspace.id);
-      Object.assign(localWorkspace, workspace);
-      this.stores.router.push('/settings/workspaces');
-    } catch (error) {
-      throw error;
-    }
+    await updateWorkspaceRequest.execute(workspace);
+    // Path local result optimistically
+    const localWorkspace = this._getWorkspaceById(workspace.id);
+    Object.assign(localWorkspace, workspace);
+    this.stores.router.push('/settings/workspaces');
   };
 
   @action _setActiveWorkspace = ({ workspace }) => {