diff --git a/src/environments-dialog.ui b/src/environments-dialog.ui
index 60d35d0..d2ade91 100644
--- a/src/environments-dialog.ui
+++ b/src/environments-dialog.ui
@@ -5,7 +5,7 @@
 
   <template class="EnvironmentsDialog" parent="AdwDialog">
     <property name="title">Manage Environments</property>
-    <property name="content-width">900</property>
+    <property name="content-width">1100</property>
     <property name="content-height">600</property>
     <property name="follows-content-size">false</property>
 
diff --git a/src/widgets/variable-data-row.ui b/src/widgets/variable-data-row.ui
index 35fc089..c012097 100644
--- a/src/widgets/variable-data-row.ui
+++ b/src/widgets/variable-data-row.ui
@@ -21,62 +21,62 @@
             <property name="hexpand">True</property>
           </object>
         </child>
+      </object>
+    </child>
 
-        <!-- Inline edit buttons (shown only when editing) -->
+    <!-- Inline edit buttons (shown only when editing) -->
+    <child>
+      <object class="GtkRevealer" id="edit_buttons_revealer">
+        <property name="transition-type">slide-left</property>
+        <property name="reveal-child">False</property>
         <child>
-          <object class="GtkRevealer" id="edit_buttons_revealer">
-            <property name="transition-type">slide-left</property>
-            <property name="reveal-child">False</property>
+          <object class="GtkBox">
+            <property name="spacing">3</property>
             <child>
-              <object class="GtkBox">
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkButton" id="cancel_button">
-                    <property name="icon-name">process-stop-symbolic</property>
-                    <property name="tooltip-text">Cancel editing</property>
-                    <signal name="clicked" handler="on_cancel_clicked"/>
-                    <style>
-                      <class name="flat"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="save_button">
-                    <property name="icon-name">object-select-symbolic</property>
-                    <property name="tooltip-text">Save changes</property>
-                    <signal name="clicked" handler="on_save_clicked"/>
-                    <style>
-                      <class name="flat"/>
-                      <class name="suggested-action"/>
-                    </style>
-                  </object>
-                </child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="icon-name">process-stop-symbolic</property>
+                <property name="tooltip-text">Cancel editing</property>
+                <signal name="clicked" handler="on_cancel_clicked"/>
+                <style>
+                  <class name="flat"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="save_button">
+                <property name="icon-name">object-select-symbolic</property>
+                <property name="tooltip-text">Save changes</property>
+                <signal name="clicked" handler="on_save_clicked"/>
+                <style>
+                  <class name="flat"/>
+                  <class name="suggested-action"/>
+                </style>
               </object>
             </child>
           </object>
         </child>
+      </object>
+    </child>
 
-        <child>
-          <object class="GtkToggleButton" id="sensitive_toggle">
-            <property name="icon-name">changes-allow-symbolic</property>
-            <property name="tooltip-text">Mark as sensitive (store in keyring)</property>
-            <signal name="toggled" handler="on_sensitive_toggled"/>
-            <style>
-              <class name="flat"/>
-            </style>
-          </object>
-        </child>
+    <child>
+      <object class="GtkToggleButton" id="sensitive_toggle">
+        <property name="icon-name">changes-allow-symbolic</property>
+        <property name="tooltip-text">Mark as sensitive (store in keyring)</property>
+        <signal name="toggled" handler="on_sensitive_toggled"/>
+        <style>
+          <class name="flat"/>
+        </style>
+      </object>
+    </child>
 
-        <child>
-          <object class="GtkButton" id="delete_button">
-            <property name="icon-name">edit-delete-symbolic</property>
-            <property name="tooltip-text">Delete variable</property>
-            <signal name="clicked" handler="on_delete_clicked"/>
-            <style>
-              <class name="flat"/>
-            </style>
-          </object>
-        </child>
+    <child>
+      <object class="GtkButton" id="delete_button">
+        <property name="icon-name">edit-delete-symbolic</property>
+        <property name="tooltip-text">Delete variable</property>
+        <signal name="clicked" handler="on_delete_clicked"/>
+        <style>
+          <class name="flat"/>
+        </style>
       </object>
     </child>