diff --git a/pkg/interface/src/logic/lib/omnibox.js b/pkg/interface/src/logic/lib/omnibox.js
index 429d7414c6..f52064b7c6 100644
--- a/pkg/interface/src/logic/lib/omnibox.js
+++ b/pkg/interface/src/logic/lib/omnibox.js
@@ -34,7 +34,7 @@ const commandIndex = function () {
 
       title = title.charAt(0).toUpperCase() + title.slice(1);
 
-      let obj = result(`${title}: Create`, `/~${e}/new`, e, null);
+      let obj = result(`${title}: Create`, `/~${e}/new`, title, null);
       commands.push(obj);
 
       if (title === 'Groups') {
diff --git a/pkg/interface/src/views/App.js b/pkg/interface/src/views/App.js
index 9b01581454..9d35c772ad 100644
--- a/pkg/interface/src/views/App.js
+++ b/pkg/interface/src/views/App.js
@@ -17,6 +17,7 @@ import dark from './themes/old-dark';
 import { Content } from './components/Content';
 import StatusBar from './components/StatusBar';
 import Omnibox from './components/leap/Omnibox';
+import ErrorBoundary from '~/views/components/ErrorBoundary';
 
 import GlobalStore from '~/logic/store/store';
 import GlobalSubscription from '~/logic/subscription/global';
@@ -132,28 +133,34 @@ class App extends React.Component {
         </Helmet>
         <Root background={background} >
           <Router>
-            <StatusBarWithRouter
-              props={this.props}
-              associations={associations}
-              invites={this.state.invites}
-              api={this.api}
-              connection={this.state.connection}
-              subscription={this.subscription}
-              ship={this.ship}
-            />
-            <Omnibox
-              associations={state.associations}
-              apps={state.launch}
-              api={this.api}
-              dark={state.dark}
-              show={state.omniboxShown}
-            />
-          <Content
-            ship={this.ship}
-            api={this.api}
-            subscription={this.subscription}
-            {...state}
-          />
+            <ErrorBoundary>
+              <StatusBarWithRouter
+                props={this.props}
+                associations={associations}
+                invites={this.state.invites}
+                api={this.api}
+                connection={this.state.connection}
+                subscription={this.subscription}
+                ship={this.ship}
+              />
+            </ErrorBoundary>
+            <ErrorBoundary>
+              <Omnibox
+                associations={state.associations}
+                apps={state.launch}
+                api={this.api}
+                dark={state.dark}
+                show={state.omniboxShown}
+              />
+            </ErrorBoundary>
+            <ErrorBoundary>
+              <Content
+                ship={this.ship}
+                api={this.api}
+                subscription={this.subscription}
+                {...state}
+              />
+            </ErrorBoundary>
           </Router>
         </Root>
       </ThemeProvider>