diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss
index 2d78f1148..150b35e36 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss
@@ -65,11 +65,6 @@ select.bs-select-hidden, .bootstrap-select > select.bs-select-hidden, select.sel
   &:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
     width: 348px;
   }
-  > select.mobile-device:focus + .dropdown-toggle, .dropdown-toggle:focus {
-    outline: thin dotted #333333 !important;
-    outline: 5px auto -webkit-focus-ring-color !important;
-    outline-offset: -2px;
-  }
   &.form-control {
     margin-bottom: 0;
     padding: 0;
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
index 53860ad56..b94eafa3a 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/tokenize2.scss
@@ -75,7 +75,7 @@
         padding: 0;
       }
     }
-    &:hover {
+    &:focus, &:hover {
       border-color: #ec6d12;
       background-color: #2a2a2a;
       -webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css
index db0488057..d8cfa48d2 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css
@@ -87,12 +87,7 @@ select.selectpicker {
 .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
   width: 348px;
 }
-.bootstrap-select > select.mobile-device:focus + .dropdown-toggle,
-.bootstrap-select .dropdown-toggle:focus {
-  outline: thin dotted #333333 !important;
-  outline: 5px auto -webkit-focus-ring-color !important;
-  outline-offset: -2px;
-}
+
 .bootstrap-select.form-control {
   margin-bottom: 0;
   padding: 0;
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
index d3036d7d7..3028396c3 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/tokenize2.css
@@ -75,6 +75,8 @@
 	color:#fff;
     padding: 0;
 }
+
+.tokenize > .tokens-container:focus,
 .tokenize > .tokens-container:hover {
 	border-color:#ec6d12;
 	background-color:#2a2a2a;
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss
index 2d78f1148..150b35e36 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss
@@ -65,11 +65,6 @@ select.bs-select-hidden, .bootstrap-select > select.bs-select-hidden, select.sel
   &:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
     width: 348px;
   }
-  > select.mobile-device:focus + .dropdown-toggle, .dropdown-toggle:focus {
-    outline: thin dotted #333333 !important;
-    outline: 5px auto -webkit-focus-ring-color !important;
-    outline-offset: -2px;
-  }
   &.form-control {
     margin-bottom: 0;
     padding: 0;
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/tokenizer2.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/tokenizer2.scss
index 106ce7bfc..419345afb 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/tokenizer2.scss
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/tokenizer2.scss
@@ -76,7 +76,7 @@
         padding: 0;
       }
     }
-    &:hover {
+    &:focus, &:hover {
       border-color: #00A7FF;
       background-color: none;
     }
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css
index db0488057..d8cfa48d2 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css
@@ -87,12 +87,7 @@ select.selectpicker {
 .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
   width: 348px;
 }
-.bootstrap-select > select.mobile-device:focus + .dropdown-toggle,
-.bootstrap-select .dropdown-toggle:focus {
-  outline: thin dotted #333333 !important;
-  outline: 5px auto -webkit-focus-ring-color !important;
-  outline-offset: -2px;
-}
+
 .bootstrap-select.form-control {
   margin-bottom: 0;
   padding: 0;
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/tokenize2.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/tokenize2.css
index 6cc09737c..58ea8794a 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/tokenize2.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/tokenize2.css
@@ -72,10 +72,13 @@
 	color:#c9c9c9;
     padding: 0;
 }
+
 .tokenize > .tokens-container > .token-search {
 	color:#000;
     padding: 0;
 }
+
+.tokenize > .tokens-container:focus,
 .tokenize > .tokens-container:hover {
 	border-color:#00A7FF;
 	background-color:none;
@@ -91,6 +94,7 @@
     width: 100%;
 }
 
+
 .tokenize > .tokens-container > .token-search > input::-ms-clear {
     display: none;
 }