diff --git a/src/js/components/App/TimerView.js b/src/js/components/App/TimerView.js
index f907a63..16673f5 100644
--- a/src/js/components/App/TimerView.js
+++ b/src/js/components/App/TimerView.js
@@ -25,7 +25,7 @@ export default function TimerView({ timedActivity, onStopTimer }) {
         offset={timedActivity.seconds}
         style={{ fontSize: "36px", display: "inline-block" }}
       />
-      <button className="moco-bx-btn btn-stop-timer" onClick={handleStopTimer}>
+      <button className="moco-bx-btn btn-stop-timer" onClick={handleStopTimer} autoFocus>
         <StopWatch />
       </button>
     </div>
diff --git a/src/js/components/Popup.js b/src/js/components/Popup.js
index 03f9ab9..1d41d87 100644
--- a/src/js/components/Popup.js
+++ b/src/js/components/Popup.js
@@ -19,13 +19,6 @@ const Popup = forwardRef((props, ref) => {
   }
 
   useEffect(() => {
-    // Document might lose focus when clicking the browser action.
-    // Document might be out of focus when hitting the shortcut key.
-    // This puts the focus back to the document and ensures that:
-    // - the autofocus on the hours input field is triggered
-    // - the ESC key closes the popup without closing anything else
-    window.focus()
-    document.activeElement?.blur()
     window.addEventListener("message", handleMessage)
     return () => {
       window.removeEventListener("message", handleMessage)