diff --git a/packages/web/src/Screen.js b/packages/web/src/Screen.js
index 33f17598..616a9be1 100644
--- a/packages/web/src/Screen.js
+++ b/packages/web/src/Screen.js
@@ -51,6 +51,7 @@ const LeftPanel = styled.div`
 const TabsPanelContainer = styled.div`
   display: flex;
   position: fixed;
+  overflow-x: auto;
   top: ${theme.toolBar.height}px;
   left: ${(props) => props.contentLeft}px;
   height: ${theme.tabsPanel.height}px;
diff --git a/packages/web/src/TabsPanel.js b/packages/web/src/TabsPanel.js
index cc2f34d5..22f9f017 100644
--- a/packages/web/src/TabsPanel.js
+++ b/packages/web/src/TabsPanel.js
@@ -18,20 +18,30 @@ import { getConnectionInfo } from './utility/metadataLoaders';
 const DbGroupHandler = styled.div`
   display: flex;
   flex: 1;
+  align-content: stretch;
 `;
 
 const DbWrapperHandler = styled.div`
   display: flex;
   flex-direction: column;
+  align-items: stretch;
 `;
 
 const DbNameWrapper = styled.div`
   text-align: center;
   font-size: 8pt;
-  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
   border-right: 1px solid white;
   cursor: pointer;
   user-select: none;
+  padding: 1px;
+  position: relative;
+  white-space: nowrap;
+
+  overflow: hidden;
+  text-overflow: ellipsis;
+  // height: 15px;
+
   &:hover {
     background-color: #aaa;
   }
@@ -40,12 +50,17 @@ const DbNameWrapper = styled.div`
     props.selected ? theme.mainArea.background : 'inherit'};
 `;
 
+// const DbNameWrapperInner = styled.div`
+//   position: absolute;
+//   white-space: nowrap;
+// `;
+
 const FileTabItem = styled.div`
   border-right: 1px solid white;
   padding-left: 15px;
   padding-right: 15px;
   flex-shrink: 1;
-  flex-grow: 0;
+  flex-grow: 1;
   min-width: 10px;
   display: flex;
   align-items: center;
@@ -193,8 +208,15 @@ export default function TabsPanel() {
     <>
       {dbKeys.map((dbKey) => (
         <DbWrapperHandler key={dbKey}>
+          <DbNameWrapper
+            // @ts-ignore
+            selected={tabsByDb[dbKey][0].tabDbKey == currentDbKey}
+            onClick={() => handleSetDb(tabsByDb[dbKey][0].props)}
+          >
+            <i className="fas fa-database" /> {tabsByDb[dbKey][0].tabDbName}
+          </DbNameWrapper>
           <DbGroupHandler>
-            {tabsByDb[dbKey].map((tab) => (
+            {_.sortBy(tabsByDb[dbKey], 'title').map((tab) => (
               <FileTabItem
                 {...tab}
                 title={tab.tooltip}
@@ -215,13 +237,6 @@ export default function TabsPanel() {
               </FileTabItem>
             ))}
           </DbGroupHandler>
-          <DbNameWrapper
-            // @ts-ignore
-            selected={tabsByDb[dbKey][0].tabDbKey == currentDbKey}
-            onClick={() => handleSetDb(tabsByDb[dbKey][0].props)}
-          >
-            <i className="fas fa-database" /> {tabsByDb[dbKey][0].tabDbName}
-          </DbNameWrapper>
         </DbWrapperHandler>
       ))}
     </>
diff --git a/packages/web/src/theme.js b/packages/web/src/theme.js
index 39ad2882..2edd2d7d 100644
--- a/packages/web/src/theme.js
+++ b/packages/web/src/theme.js
@@ -12,7 +12,7 @@ export default {
     background: '#ccc',
   },
   tabsPanel: {
-    height: 45,
+    height: 53,
     background: '#ddd',
     hoverFont: '#338',
   },