diff --git a/app/styles/base.css b/app/styles/base.css
index 73b71311..df0daf0d 100644
--- a/app/styles/base.css
+++ b/app/styles/base.css
@@ -401,23 +401,17 @@ html {
      https://bugzilla.mozilla.org/show_bug.cgi?id=1798304 */
   cursor: default;
 }
-#noVNC_control_bar .noVNC_button:focus {
-  outline: none;
-  box-shadow: none;
-}
 #noVNC_control_bar .noVNC_button:not(:disabled):active {
   padding-top: 5px;
   padding-bottom: 3px;
 }
-/* Android browsers don't properly update hover state if touch events
- * are intercepted, but focus should be safe to display */
-:root:not(.noVNC_touch) #noVNC_control_bar .noVNC_button.noVNC_selected:not(:disabled):hover,
-#noVNC_control_bar .noVNC_button.noVNC_selected:not(:disabled):focus {
+/* Android browsers don't properly update hover state if touch events are
+ * intercepted */
+:root:not(.noVNC_touch) #noVNC_control_bar .noVNC_button.noVNC_selected:not(:disabled):hover {
   border-color: rgba(0, 0, 0, 0.4);
   background: rgba(0, 0, 0, 0.2);
 }
-:root:not(.noVNC_touch) #noVNC_control_bar .noVNC_button:not(:disabled):hover,
-#noVNC_control_bar .noVNC_button:not(:disabled):focus {
+:root:not(.noVNC_touch) #noVNC_control_bar .noVNC_button:not(:disabled):hover {
   background: rgba(255, 255, 255, 0.2);
 }
 #noVNC_control_bar .noVNC_button.noVNC_hidden {
diff --git a/app/styles/input.css b/app/styles/input.css
index b914903c..17e63192 100644
--- a/app/styles/input.css
+++ b/app/styles/input.css
@@ -151,29 +151,29 @@ input[type=range]::-moz-range-thumb {
   margin-top: -7px;
 }
 
-input:not([type]):focus,
-input[type=button]:focus,
-input[type=color]:focus,
-input[type=image]:focus,
-input[type=date]:focus,
-input[type=datetime-local]:focus,
-input[type=email]:focus,
-input[type=month]:focus,
-input[type=number]:focus,
-input[type=password]:focus,
-input[type=reset]:focus,
-input[type=search]:focus,
-input[type=submit]:focus,
-input[type=tel]:focus,
-input[type=text]:focus,
-input[type=time]:focus,
-input[type=url]:focus,
-input[type=week]:focus,
-input[type=checkbox]:focus,
-input[type=range]:focus,
-button:focus,
-select:focus,
-textarea:focus {
+input:not([type]):focus-visible,
+input[type=button]:focus-visible,
+input[type=color]:focus-visible,
+input[type=image]:focus-visible,
+input[type=date]:focus-visible,
+input[type=datetime-local]:focus-visible,
+input[type=email]:focus-visible,
+input[type=month]:focus-visible,
+input[type=number]:focus-visible,
+input[type=password]:focus-visible,
+input[type=reset]:focus-visible,
+input[type=search]:focus-visible,
+input[type=submit]:focus-visible,
+input[type=tel]:focus-visible,
+input[type=text]:focus-visible,
+input[type=time]:focus-visible,
+input[type=url]:focus-visible,
+input[type=week]:focus-visible,
+input[type=checkbox]:focus-visible,
+input[type=range]:focus-visible,
+button:focus-visible,
+select:focus-visible,
+textarea:focus-visible {
   box-shadow: 0px 0px 3px rgba(74, 144, 217, 0.5);
   border-color: rgb(74, 144, 217);
   outline: none;