diff --git a/src/button/Button.module.css b/src/button/Button.module.css
index 193395c..72306db 100644
--- a/src/button/Button.module.css
+++ b/src/button/Button.module.css
@@ -46,6 +46,15 @@ limitations under the License.
   background-color: var(--primaryColor);
 }
 
+.button:focus,
+.toolbarButton:focus,
+.iconButton:focus,
+.iconCopyButton:focus,
+.secondary:focus,
+.copyButton:focus {
+  outline: auto;
+}
+
 .toolbarButton {
   width: 50px;
   height: 50px;
diff --git a/src/input/SelectInput.module.css b/src/input/SelectInput.module.css
index 723ab43..1679341 100644
--- a/src/input/SelectInput.module.css
+++ b/src/input/SelectInput.module.css
@@ -27,6 +27,10 @@
   width: 100%;
 }
 
+.selectTrigger:focus {
+  outline: auto;
+}
+
 .selectedItem {
   white-space: nowrap;
   overflow: hidden;
diff --git a/src/usePageFocusStyle.module.css b/src/usePageFocusStyle.module.css
index 9ef4875..f54eff6 100644
--- a/src/usePageFocusStyle.module.css
+++ b/src/usePageFocusStyle.module.css
@@ -1,3 +1,3 @@
 .hideFocus * {
-  outline: none;
+  outline: none !important;
 }