diff --git a/src/renderer/components/dock/dock-tab.scss b/src/renderer/components/dock/dock-tab.scss
index a90bd9e594..881c35cf62 100644
--- a/src/renderer/components/dock/dock-tab.scss
+++ b/src/renderer/components/dock/dock-tab.scss
@@ -28,10 +28,6 @@
     padding-right: $padding;
   }
 
-  &:first-child {
-    padding-left: 0;
-  }
-
   &:last-child {
     padding-right: $padding;
   }
diff --git a/src/renderer/components/dock/dock-tabs.tsx b/src/renderer/components/dock/dock-tabs.tsx
index 8902fe439a..e7699229f1 100644
--- a/src/renderer/components/dock/dock-tabs.tsx
+++ b/src/renderer/components/dock/dock-tabs.tsx
@@ -3,8 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import React, { Fragment } from "react";
-
+import React, { Fragment, useRef, useEffect, useState, UIEvent } from "react";
 import { Icon } from "../icon";
 import { Tabs } from "../tabs/tabs";
 import { DockTab } from "./dock-tab";
@@ -20,6 +19,43 @@ interface Props {
 }
 
 export const DockTabs = ({ tabs, autoFocus, selectedTab, onChangeTab }: Props) => {
+  const elem = useRef(null);
+  const contentElem = useRef(null);
+  const [scrollPosition, setScrollPosition] = useState(0);
+  const scrollStep = 200;
+
+  const scrollToRight = (): void => {
+    if(!elem) return;
+
+    setScrollPosition(scrollPosition + scrollStep);
+
+    elem.current.scrollLeft = scrollPosition;
+  };
+
+
+  const scrollToLeft = (): void => {
+    if(!elem) return;
+
+    setScrollPosition(scrollPosition - scrollStep);
+
+    elem.current.scrollLeft = scrollPosition;
+  };
+
+  const  isScrollableRight = (): boolean => {
+    if(!elem || !contentElem) return false;
+
+    const containerWidth = elem.current?.clientWidth;
+    const contentWidth = contentElem.current?.clientWidth;
+
+    return contentWidth > containerWidth && scrollPosition < contentWidth - scrollStep;
+  };
+
+  const  isScrollableLeft = (): boolean => {
+    if(!elem || !contentElem) return false;
+
+    return scrollPosition > scrollStep;
+  };
+
   const renderTab = (tab?: DockTabModel) => {
     if (!tab) {
       return null;
@@ -39,14 +75,46 @@ export const DockTabs = ({ tabs, autoFocus, selectedTab, onChangeTab }: Props) =
     }
   };
 
+  useEffect(() => {
+    elem.current.addEventListener("scroll", ( evt: UIEvent<HTMLDivElement>) => {
+      const position = evt.currentTarget.scrollLeft;
+
+      if (position!== undefined) {
+        setScrollPosition(position);
+      }
+    });
+  }, []);
+
   return (
-    <Tabs
-      className="DockTabs"
-      autoFocus={autoFocus}
-      value={selectedTab}
-      onChange={onChangeTab}
-    >
-      {tabs.map(tab => <Fragment key={tab.id}>{renderTab(tab)}</Fragment>)}
-    </Tabs>
+    <div style={{ overflow: "hidden" }} className={"flex gaps align-center"}>
+      {isScrollableLeft() && (
+        <Icon
+          material="keyboard_arrow_left"
+          tooltip="Show tabs to the left"
+          onClick={scrollToLeft}
+          className={"tab-control scroll-left"}
+        />
+      )}
+      <div ref={elem} className={"tabs-control flex gaps align-center"}>
+        <div ref={contentElem} className={"scrollable"}>
+          <Tabs
+            className="DockTabs"
+            autoFocus={autoFocus}
+            value={selectedTab}
+            onChange={onChangeTab}
+          >
+            {tabs.map(tab => <Fragment key={tab.id}>{renderTab(tab)}</Fragment>)}
+          </Tabs>
+        </div>
+      </div>
+      {isScrollableRight() && (
+        <Icon
+          material="keyboard_arrow_right"
+          tooltip="Show tabs to the right"
+          onClick={scrollToRight}
+          className={"tab-control scroll-right"}
+        />
+      )}
+    </div>
   );
 };
diff --git a/src/renderer/components/dock/dock.scss b/src/renderer/components/dock/dock.scss
index 7a543ce934..255ff2fcfc 100644
--- a/src/renderer/components/dock/dock.scss
+++ b/src/renderer/components/dock/dock.scss
@@ -76,4 +76,47 @@
       bottom: 0;
     }
   }
+
+  .tabs-control {
+    overflow: auto;
+    position: relative;
+
+    &::-webkit-scrollbar {
+      visibility: hidden;
+      height: 4px;
+      background:transparent;
+      position: absolute;
+      bottom: 0;
+    }
+
+    &:hover::-webkit-scrollbar {
+      visibility: visible;
+    }
+
+    &:hover::-webkit-scrollbar-thumb {
+      background: var(--scrollBarColor);
+    }
+
+    .tab-control {
+      position: absolute;
+      z-index: 9999;
+    }
+
+    .scroll-left {
+      left: 0;
+    }
+
+    .right {
+      right: 0;
+    }
+
+  }
+
+  .DockTab.active {
+    background-color: var(--menuActiveBackground);
+
+    &::after {
+      color: var(--terminalWhite);
+    }
+  }
 }
diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx
index 359c51790d..c3619c83b6 100644
--- a/src/renderer/components/dock/dock.tsx
+++ b/src/renderer/components/dock/dock.tsx
@@ -8,7 +8,7 @@ import "./dock.scss";
 import React from "react";
 import { observer } from "mobx-react";
 
-import { cssNames, prevDefault } from "../../utils";
+import { cssNames } from "../../utils";
 import { Icon } from "../icon";
 import { MenuItem } from "../menu";
 import { MenuActions } from "../menu/menu-actions";
@@ -91,20 +91,6 @@ class NonInjectedDock extends React.Component<Props & Dependencies> {
     }
   }
 
-  isScrollableRight = (): boolean => {
-    if(!this.element) return false;
-    const child = document.querySelector(".DockTabs");
-
-    const parentWidth = this.element.current.clientWidth;
-    const childWidth = child && child.clientWidth || 0;
-
-    return childWidth > parentWidth;
-  };
-
-  scrollToRight = (): void => {
-    console.log("Current", this.element?.current);
-  };
-
   renderTabContent() {
     const { isOpen, height, selectedTab } = this.props.dockStore;
 
@@ -138,7 +124,7 @@ class NonInjectedDock extends React.Component<Props & Dependencies> {
           onMinExtentExceed={dockStore.open}
           onDrag={extent => dockStore.height = extent}
         />
-        <div className="tabs-container flex align-center" onDoubleClick={prevDefault(toggle)}>
+        <div className="tabs-container flex align-center">
           <DockTabs
             tabs={tabs}
             selectedTab={selectedTab}
@@ -146,11 +132,6 @@ class NonInjectedDock extends React.Component<Props & Dependencies> {
             onChangeTab={this.onChangeTab}
           />
           <div className="toolbar flex gaps align-center box grow">
-            <Icon
-              material="keyboard_arrow_right"
-              tooltip="Show tabs to the right"
-              onClick={this.scrollToRight}
-            />
             <div className="dock-menu box grow">
               <MenuActions usePortal triggerIcon={{ material: "add", className: "new-dock-tab", tooltip: "New tab" }} closeOnScroll={false}>
                 <MenuItem className="create-terminal-tab" onClick={() => this.props.createTerminalTab()}>