diff --git a/ui/src/components/Editor/toolItem.tsx b/ui/src/components/Editor/toolItem.tsx
index 9215b397..cba3a622 100644
--- a/ui/src/components/Editor/toolItem.tsx
+++ b/ui/src/components/Editor/toolItem.tsx
@@ -52,10 +52,11 @@ const ToolItem: FC<IProps> = (props) => {
     <OverlayTrigger placement="bottom" overlay={<Tooltip>{tip}</Tooltip>}>
       <Button
         variant="link"
-        className={`p-0 b-0 btn-no-border btn-no-focus toolbar icon-${label} ${
+        className={`p-0 b-0 btn-no-border toolbar icon-${label} ${
           disable ? 'disabled' : ''
         } `}
         disabled={disable}
+        tabIndex={-1}
         onClick={(e) => {
           e.preventDefault();
           if (typeof onClick === 'function') {
diff --git a/ui/src/index.scss b/ui/src/index.scss
index 207437bd..439e2e6d 100644
--- a/ui/src/index.scss
+++ b/ui/src/index.scss
@@ -119,9 +119,6 @@ a {
   border: none;
   box-shadow: none;
 }
-.btn-no-focus:focus {
-  background-color: unset !important;
-}
 
 .pointer:hover {
   cursor: pointer;