diff --git a/src/fenigma/app.py b/src/fenigma/app.py
index eb78f7c..c9f4a7c 100644
--- a/src/fenigma/app.py
+++ b/src/fenigma/app.py
@@ -248,6 +248,11 @@ class MainWindow(Adw.ApplicationWindow):
         self._watch_btn.connect("toggled", self._on_toggle_clipboard_watch)
         header.pack_start(self._watch_btn)
 
+        square_cells_btn = Gtk.ToggleButton(icon_name="view-grid-symbolic")
+        square_cells_btn.set_tooltip_text("Force square grid cells (letterbox instead of stretch)")
+        square_cells_btn.connect("toggled", lambda b: self.canvas.set_square_cells(b.get_active()))
+        header.pack_start(square_cells_btn)
+
         header.pack_start(Gtk.Separator(orientation=Gtk.Orientation.VERTICAL))
 
         for label, popover_builder in (
@@ -269,11 +274,6 @@ class MainWindow(Adw.ApplicationWindow):
         scout_btn.connect("clicked", lambda _b: self._add_scout_flight())
         header.pack_start(scout_btn)
 
-        square_cells_btn = Gtk.ToggleButton(icon_name="view-grid-symbolic")
-        square_cells_btn.set_tooltip_text("Force square grid cells (letterbox instead of stretch)")
-        square_cells_btn.connect("toggled", lambda b: self.canvas.set_square_cells(b.get_active()))
-        header.pack_start(square_cells_btn)
-
         firing_btn = Gtk.Button(icon_name="sidebar-show-right-symbolic")
         firing_btn.set_tooltip_text("Firing commands")
         firing_btn.connect("clicked", lambda _b: self._toggle_firing_panel())