diff --git a/data/resources/ui/main_window.blp b/data/resources/ui/main_window.blp
index e1ad4b5..85c75b3 100644
--- a/data/resources/ui/main_window.blp
+++ b/data/resources/ui/main_window.blp
@@ -79,16 +79,8 @@ template OsInstallerWindow : .AdwApplicationWindow {
       styles ["flat"]
     }
 
-    .AdwClamp {
-      vexpand: "1";
-      margin-start: "6";
-      margin-end: "6";
-      maximum-size: "400";
-      tightening-threshold: "320";
-
-      Stack main_stack {
-        transition-type: slide_left_right;
-      }
+    Stack main_stack {
+      transition-type: slide_left_right;
     }
   }
 }
diff --git a/src/ui/window.py b/src/ui/window.py
index 55433ad..7de85fa 100644
--- a/src/ui/window.py
+++ b/src/ui/window.py
@@ -94,7 +94,14 @@ class OsInstallerWindow(Adw.ApplicationWindow):
     def _initialize_page(self, page_to_initialize):
         if not page_to_initialize == None:
             page = page_to_initialize()
-            self.main_stack.add_named(page, page.get_name())
+            page.set_margin_start(6)
+            page.set_margin_end(6)
+            
+            clamp = Adw.Clamp()
+            clamp.set_child(page)
+            clamp.set_tightening_threshold(320)
+            clamp.set_maximum_size(400)
+            self.main_stack.add_named(clamp, page.get_name())
             self.pages.append(page)
 
     def _initialize_pages_translated(self):