diff --git a/src/librarypanel.py b/src/librarypanel.py
index 2626c7b..7d325dd 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -114,6 +114,12 @@ class LibraryToolbar(Gtk.ButtonBox):
         self.select_button.set_active(False)
 
 
+    def set_sort_order(self, sort):
+        button = self._toolbar_sort_buttons[sort]
+        if button and not button.get_active():
+            button.set_active(True)
+
+
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
@@ -389,11 +395,9 @@ class LibraryPanel(Gtk.Stack):
 
     def set_sort_order(self, sort):
         if self._sort_order != sort:
-            button = self._toolbar_sort_buttons[sort]
-            if button and not button.get_active():
-                button.set_active(True)
-                self._sort_order = sort
-                self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order)
+            self._toolbar.set_sort_order(sort)
+            self._sort_order = sort
+            self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order)
 
 
     def get_sort_order(self):