diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 7633af2c4..86f6eb08a 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -59,7 +59,7 @@ export default function App() {
               <Route path="/login" element={<Login />} />
               <Route
                 path="/workspace/:slug/settings/:tab"
-                element={<PrivateRoute Component={WorkspaceSettings} />}
+                element={<ManagerRoute Component={WorkspaceSettings} />}
               />
               <Route
                 path="/workspace/:slug"
diff --git a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
index 9ee9c40cd..9ee6a6878 100644
--- a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
+++ b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
@@ -114,10 +114,8 @@ export default function ActiveWorkspaces() {
                         : truncate(workspace.name, 20)}
                     </p>
                   </div>
-                  {isActive ||
-                  isHovered ||
-                  gearHover[workspace.id] ||
-                  user?.role === "default" ? (
+                  {(isActive || isHovered || gearHover[workspace.id]) &&
+                  user?.role !== "default" ? (
                     <div className="flex items-center gap-x-2">
                       <button
                         type="button"