diff --git a/framework/core/less/common/Button.less b/framework/core/less/common/Button.less
index 93c14f8d1..3165f9af4 100644
--- a/framework/core/less/common/Button.less
+++ b/framework/core/less/common/Button.less
@@ -64,12 +64,6 @@
   &.active,
   .open > &.Dropdown-toggle {
     .box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125));
-    outline: none;
-  }
-
-  &:focus,
-  &.focus {
-    outline: none;
   }
 
   &.disabled,
diff --git a/framework/core/less/common/Dropdown.less b/framework/core/less/common/Dropdown.less
index 2b206c6f4..f94851226 100644
--- a/framework/core/less/common/Dropdown.less
+++ b/framework/core/less/common/Dropdown.less
@@ -63,9 +63,6 @@
       &:hover {
         background: @control-bg;
       }
-      &:focus {
-        outline: none;
-      }
     }
     &.active {
       > a, > button {
diff --git a/framework/core/less/common/FormControl.less b/framework/core/less/common/FormControl.less
index 9a403c268..20f99f1f3 100644
--- a/framework/core/less/common/FormControl.less
+++ b/framework/core/less/common/FormControl.less
@@ -13,8 +13,7 @@
   transition: var(--transition);
   -webkit-appearance: none;
 
-  &:focus,
-  &.focus {
+  &:focus {
     background-color: @body-bg;
     color: @text-color;
     border-color: @primary-color;
@@ -44,6 +43,7 @@
     font-size: 16px; // minimum font-size required to prevent page zoom on focus in iOS 10
   }
 }
+
 .helpText {
   font-size: 12px;
   line-height: 1.5em;
diff --git a/framework/core/less/common/Search.less b/framework/core/less/common/Search.less
index 1138438a0..bef6114a3 100644
--- a/framework/core/less/common/Search.less
+++ b/framework/core/less/common/Search.less
@@ -70,7 +70,6 @@
   .Button {
     float: left;
     margin-left: -36px;
-    outline: none;
     width: 36px !important;
 
     &.LoadingIndicator {
diff --git a/framework/core/views/layouts/basic.blade.php b/framework/core/views/layouts/basic.blade.php
index dcaa72d16..8e7978ec0 100644
--- a/framework/core/views/layouts/basic.blade.php
+++ b/framework/core/views/layouts/basic.blade.php
@@ -86,7 +86,6 @@
       .form-control:focus,
       .form-control.focus {
          border-color: {{ $primaryColor }};
-         outline: none;
       }
       .errors {
         color: #d83e3e;