1 files changed, 17 insertions, 10 deletions

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 1c408f6d985..645f145328b 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -55,16 +55,6 @@
       box-shadow ease-in-out 0.15s;
     background-color: $white;
 
-    &.is-focused {
-      border-color: $input-focus-border-color;
-      box-shadow: $input-focus-box-shadow;
-
-      .comment-toolbar,
-      .nav-links {
-        border-color: $blue-300;
-      }
-    }
-
     &.is-dropzone-hover {
       border-color: $green-500;
       box-shadow: 0 0 2px $black-transparent,
@@ -75,9 +65,22 @@
         border-color: $green-500;
       }
     }
+
+    // Disable inner focus
+    textarea:focus {
+      @include gl-shadow-none;
+    }
+  }
+
+  .comment-warning-wrapper:focus-within {
+    @include gl-focus;
   }
 }
 
+.md-area:focus-within {
+  @include gl-focus;
+}
+
 .md-header .nav-links {
   display: flex;
   flex-flow: row wrap;
@@ -428,7 +431,11 @@ table {
 }
 
 .comment-warning-wrapper {
+  transition: border-color ease-in-out 0.15s,
+    box-shadow ease-in-out 0.15s;
+
   .md-area {
     border: 0;
+    box-shadow: none;
   }
 }