diff --git a/src/index.js b/src/index.js
index c447beccb..336e2a111 100644
--- a/src/index.js
+++ b/src/index.js
@@ -165,7 +165,10 @@ function onWillQuit (node, event) {
   logger.info('Shutting down application')
   event.preventDefault()
 
-  if (IPFS == null) return
+  if (IPFS == null) {
+    mb.app.quit()
+    return
+  }
 
   onStopDaemon(node, mb.app.quit.bind(mb.app))
 }
diff --git a/src/js/screens/menu/start.js b/src/js/screens/menu/start.js
index 28506ef51..6de9def95 100644
--- a/src/js/screens/menu/start.js
+++ b/src/js/screens/menu/start.js
@@ -7,7 +7,17 @@ function startDaemon () {
   ipcRenderer.send('start-daemon')
 }
 
+function close () {
+  ipcRenderer.send('close')
+}
+
 const styles = {
+  a: {
+    fontSize: '0.8em',
+    margin: '1em 0 0 0',
+    color: 'rgba(255,255,255,0.5)',
+    cursor: 'pointer'
+  },
   wrapper: {
     display: 'flex',
     width: '100%',
@@ -47,6 +57,7 @@ export default function StartScreen () {
         </div>
       </div>
       <TextButton text='Start Node' onClick={startDaemon} />
+      <a style={styles.a} onClick={close}>Close Station</a>
     </div>
   )
 }