diff --git a/app/background.js b/app/background.js
index 2642eb5e..5540be98 100644
--- a/app/background.js
+++ b/app/background.js
@@ -118,6 +118,9 @@ app.on('ready', function () {
     alwaysOnTop: true,
     fullscreenable: false,
     title: 'Zazu',
+    webPreferences: {
+      backgroundThrottling: false,
+    },
   })
 
   checkForUpdate()
diff --git a/app/zazu.js b/app/zazu.js
index 5e45b6ed..31c6d739 100644
--- a/app/zazu.js
+++ b/app/zazu.js
@@ -20,19 +20,17 @@ const Zazu = React.createClass({
   componentDidMount () {
     PluginStore.addThemeListener(this.updateTheme)
     PluginStore.addResultListener(this.updateResults)
+    PluginStore.addQueryListener(this.updateQuery)
 
-    globalEmitter.on('showWindow', () => {
-      setImmediate(() => PluginStore.setQuery(''))
-      this.setState({
-        query: '',
-        results: [],
-      })
+    globalEmitter.on('hideWindow', () => {
+      PluginStore.setQuery('')
     })
   },
 
   componentWillUnmount () {
-    PluginStore.removeResultListener(this.updateResults)
     PluginStore.removeThemeListener(this.updateTheme)
+    PluginStore.removeResultListener(this.updateResults)
+    PluginStore.removeQueryListener(this.updateQuery)
   },
 
   updateTheme (theme) {
@@ -47,13 +45,16 @@ const Zazu = React.createClass({
     })
   },
 
-  handleQueryChange (query) {
-    PluginStore.setQuery(query)
+  updateQuery (query) {
     this.setState({
       query,
     })
   },
 
+  handleQueryChange (query) {
+    PluginStore.setQuery(query)
+  },
+
   handleResultAction (result) {
     result.next()
     globalEmitter.emit('hideWindow')