diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 66b83d0a01..2fc71091a7 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -833,6 +833,10 @@ which caused click on free space infront of a tag stops nm row selection*/
 /*
 Nextmatch print dialog
 */
+#nm_print_dialog et2-number::part(base) {
+	width: 5em;
+}
+
 #nm_print_dialog et2-switch#_orientation .label .on {
 	background-image: url('images/portrait.svg');
 }
diff --git a/api/templates/default/nm_print_dialog.xet b/api/templates/default/nm_print_dialog.xet
index 2f201c3a1a..ebce3358bb 100644
--- a/api/templates/default/nm_print_dialog.xet
+++ b/api/templates/default/nm_print_dialog.xet
@@ -5,11 +5,13 @@
         <et2-vbox>
             <et2-description value="Columns to print"></et2-description>
             <et2-nextmatch-columnselection id="columns"></et2-nextmatch-columnselection>
-            <et2-number id="row_count" label="How many rows to print" precision="0"></et2-number>
             <et2-hbox>
-                <et2-description value="Print orientation"/>
-                <et2-switch id="orientation" label="Print orientation" toggleOn="Portrait" toggleOff="Landscape"
-                            class="et2SlideSwitch"></et2-switch>
+                <et2-number id="row_count" label="How many rows to print" precision="0"></et2-number>
+                <et2-box>
+                    <et2-description value="Print orientation"/>
+                    <et2-switch id="orientation" label="Print orientation" toggleOn="Portrait" toggleOff="Landscape"
+                                class="et2SlideSwitch"></et2-switch>
+                </et2-box>
             </et2-hbox>
         </et2-vbox>
     </template>