diff --git a/src/index.scss b/src/index.scss
index 9dc1851b..c6be1685 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -49,12 +49,6 @@ a.#{$ns}-button {
     text-align: left;
 }
 
-// https://github.com/palantir/blueprint/issues/
-.#{$ns}-control input:focus:not(:focus-visible) ~ .#{$ns}-control-indicator,
-.#{$ns}-button:focus:not(:focus-visible) {
-    outline: none;
-}
-
 .#{$ns}-button-text > img {
     display: block;
 }
diff --git a/src/index.tsx b/src/index.tsx
index 813f8b15..70651480 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) 2020-2022 The Pybricks Authors
 
+import { FocusStyleManager } from '@blueprintjs/core';
 import { I18nContext } from '@shopify/react-i18n';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -46,6 +47,8 @@ if (appVersion.match(/beta/)) {
 
 sagaMiddleware.run(rootSaga);
 
+FocusStyleManager.onlyShowFocusOnTabs();
+
 ReactDOM.render(
     <React.StrictMode>
         <Provider store={store}>