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