diff --git a/packages/xod-client/src/core/styles/base/base.scss b/packages/xod-client/src/core/styles/base/base.scss
index 72bd58b0..70d80c4e 100644
--- a/packages/xod-client/src/core/styles/base/base.scss
+++ b/packages/xod-client/src/core/styles/base/base.scss
@@ -8,4 +8,8 @@ body, html {
   overflow: hidden;
   width: 100%;
   height: 100%;
-}
\ No newline at end of file
+}
+
+*:focus {
+  outline: none;
+}
diff --git a/packages/xod-client/src/core/styles/components/Comment.scss b/packages/xod-client/src/core/styles/components/Comment.scss
index 5f7f325f..95c0b87b 100644
--- a/packages/xod-client/src/core/styles/components/Comment.scss
+++ b/packages/xod-client/src/core/styles/components/Comment.scss
@@ -48,6 +48,15 @@
 
     a {
       color: $color-canvas-selected;
+
+      &:focus {
+        outline: 0;
+        box-shadow: 0 0 5px 1px $color-canvas-selected;
+        border: 2px solid transparent;
+        border-top: 0;
+        margin-left: -2px;
+        border-radius: 4px;
+      }
     }
   }