diff --git a/src/app/app.less b/src/app/app.less
index e9e9cfcde..3eb0639a8 100644
--- a/src/app/app.less
+++ b/src/app/app.less
@@ -94,20 +94,11 @@ svg.icon {
 .hoverEffect {
     &:hover {
         cursor: pointer;
-        box-shadow: 0px 2px 2px 0 rgba(255, 255, 255, 0.1), 0px 4px 5px 0 rgba(255, 255, 255, 0.2),
-            0px 0px 5px 2.5px rgba(255, 255, 255, 0.5);
-        transition: box-shadow 0.2s ease;
     }
 }
 
 .hover-effect-base:hover {
     cursor: pointer;
-
-    .hover-effect-target {
-        box-shadow: 0px 2px 2px 0 rgba(255, 255, 255, 0.1), 0px 4px 5px 0 rgba(255, 255, 255, 0.2),
-            0px 0px 5px 2.5px rgba(255, 255, 255, 0.5);
-        transition: box-shadow 0.2s ease;
-    }
 }
 
 .hideScrollbarUntillHover {
@@ -547,3 +538,7 @@ a.a-block {
         fill: @status-error;
     }
 }
+
+.unselectable {
+    user-select: none;
+}
diff --git a/src/app/sidebar/MainSideBar.tsx b/src/app/sidebar/MainSideBar.tsx
index c5a171733..9ca763404 100644
--- a/src/app/sidebar/MainSideBar.tsx
+++ b/src/app/sidebar/MainSideBar.tsx
@@ -206,28 +206,23 @@ class MainSideBar extends React.Component<{}, {}> {
                 </div>
                 <div className="contents">
                     <div className="top">
-                        <div className="item hoverEffect" onClick={this.handlePluginsClick}>
-                            <AppsIcon className="icon" />
-                            Apps
-                            <span className="hotkey">&#x2318;A</span>
-                        </div>
-                        <div className="item hoverEffect" onClick={this.handleHistoryClick}>
+                        <div className="item hoverEffect unselectable" onClick={this.handleHistoryClick}>
                             <HistoryIcon className="icon" />
                             History
                             <span className="hotkey">&#x2318;H</span>
                         </div>
-                        <div className="item hoverEffect" onClick={this.handleBookmarksClick}>
+                        {/* <div className="item hoverEffect unselectable" onClick={this.handleBookmarksClick}>
                             <FavoritesIcon className="icon" />
                             Favorites
                             <span className="hotkey">&#x2318;B</span>
-                        </div>
-                        <div className="item hoverEffect" onClick={this.handleConnectionsClick}>
+                        </div>  */}
+                        <div className="item hoverEffect unselectable" onClick={this.handleConnectionsClick}>
                             <ConnectionsIcon className="icon" />
                             Connections
                         </div>
                     </div>
                     <div className="separator" />
-                    <div className="item workspaces-item">
+                    <div className="item workspaces-item unselectable">
                         <WorkspacesIcon className="icon" />
                         Workspaces
                         <div className="add_workspace hoverEffect" onClick={this.handleNewSession}>
@@ -236,15 +231,20 @@ class MainSideBar extends React.Component<{}, {}> {
                     </div>
                     <div className="middle hideScrollbarUntillHover">{this.getSessions()}</div>
                     <div className="bottom">
-                        <div className="item hoverEffect" onClick={this.handleSettingsClick}>
+                        <div className="item hoverEffect unselectable" onClick={this.handlePluginsClick}>
+                            <AppsIcon className="icon" />
+                            Apps
+                            <span className="hotkey">&#x2318;A</span>
+                        </div>
+                        <div className="item hoverEffect unselectable" onClick={this.handleSettingsClick}>
                             <SettingsIcon className="icon" />
                             Settings
                         </div>
-                        <div className="item hoverEffect" onClick={() => openLink("https://docs.getprompt.dev")}>
+                        <div className="item hoverEffect unselectable" onClick={() => openLink("https://docs.getprompt.dev")}>
                             <HelpIcon className="icon" />
                             Documentation
                         </div>
-                        <div className="item hoverEffect" onClick={() => openLink("https://discord.gg/XfvZ334gwU")}>
+                        <div className="item hoverEffect unselectable" onClick={() => openLink("https://discord.gg/XfvZ334gwU")}>
                             <DiscordIcon className="icon discord" />
                             Talk to us
                         </div>
diff --git a/src/app/workspace/screen/tabs.less b/src/app/workspace/screen/tabs.less
index 088059b1b..eff5ae534 100644
--- a/src/app/workspace/screen/tabs.less
+++ b/src/app/workspace/screen/tabs.less
@@ -134,9 +134,6 @@
                 display: block;
             }
         }
-        &:hover:not(.is-active) {
-            border-color: @disabled-color !important;
-        }
     }
 
     &:hover .screen-tab .tab-index {