self.gallery_store_filtered)
             self.include_dirs = False
             self.recurse_dirs = False
-            self.per_row = 3
+            self.per_row = 5
 
         def init_key_control():
             key_ctl = Gtk.EventControllerKey(
                 if isinstance(b, DirItem) and not isinstance(a, DirItem):
                     return +1
             # apply self.sort_order within DirItems and FileItems (separately)
+            ret = 0
             for key in self.sort_order:
                 a_cmp = None
                 b_cmp = None
                 if a_cmp is None and b_cmp is None:
                     continue
                 if a_cmp is None:
-                    return -1
-                if b_cmp is None:
-                    return +1
-                if a_cmp > b_cmp:
-                    return +1
-                if a_cmp < b_cmp:
-                    return -1
-            return 0
+                    ret = -1
+                elif b_cmp is None:
+                    ret = +1
+                elif a_cmp > b_cmp:
+                    ret = +1
+                elif a_cmp < b_cmp:
+                    ret = -1
+            return ret
 
         def init_gallery_slot(file_item):
             slot = Gtk.Box()