diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
index b04dd8405..f58b644a2 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
@@ -24,12 +24,15 @@ const DefaultTab = ({ setTab }) => (
 
 const EnvironmentSettings = ({ collection }) => {
   const [isModified, setIsModified] = useState(false);
-  const [selectedEnvironment, setSelectedEnvironment] = useState(null);
+  const environments = collection?.environments || [];
+
+  const [selectedEnvironment, setSelectedEnvironment] = useState(() => {
+    if (!environments.length) return null;
+    return environments.find((env) => env.uid === collection?.activeEnvironmentUid) || environments[0];
+  });
   const [tab, setTab] = useState('default');
   const [showExportModal, setShowExportModal] = useState(false);
 
-  const environments = collection?.environments || [];
-
   if (!environments || !environments.length) {
     return (
       <StyledWrapper>
diff --git a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
index 741d1142f..07205f4f7 100644
--- a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
@@ -59,7 +59,6 @@ const Wrapper = styled.div`
       border: 1px solid transparent;
       padding: 6px 0;
       flex-shrink: 0;
-      transition: background-color 0.15s ease;
       margin-bottom: 3px;
 
       .tab-container {
diff --git a/packages/bruno-app/src/components/WorkspaceTabs/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceTabs/StyledWrapper.js
index 215e0d2ca..87703b56a 100644
--- a/packages/bruno-app/src/components/WorkspaceTabs/StyledWrapper.js
+++ b/packages/bruno-app/src/components/WorkspaceTabs/StyledWrapper.js
@@ -59,7 +59,6 @@ const Wrapper = styled.div`
       border: 1px solid transparent;
       padding: 6px 0;
       flex-shrink: 0;
-      transition: background-color 0.15s ease;
       margin-bottom: 3px;
 
       .tab-container {