diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js
index 6253e6d5..8ce56f2d 100644
--- a/browser/main/modals/PreferencesModal/HotkeyTab.js
+++ b/browser/main/modals/PreferencesModal/HotkeyTab.js
@@ -50,12 +50,6 @@ class HotkeyTab extends React.Component {
       type: 'SET_UI',
       config: newConfig
     })
-
-    setTimeout(() => {
-      this.setState({
-        keymapAlert: null
-      })
-    }, 2000)
   }
 
   handleHintToggleButtonClick (e) {
@@ -75,6 +69,11 @@ class HotkeyTab extends React.Component {
     })
   }
 
+  componentWillUnmount () {
+    console.log("YAYA")
+    clearTimeout(this.timer)
+  }
+
   render () {
     let keymapAlert = this.state.keymapAlert
     let keymapAlertElement = keymapAlert != null