diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
index 8f3faa7e9..dc3b5e3ee 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
@@ -22,6 +22,7 @@ VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget
     sortComboBox->addItem("Sort Alphabetically (Filename)", Alphabetical);
     sortComboBox->addItem("Sort by Last Modified", ByLastModified);
     sortComboBox->addItem("Sort by Last Loaded", ByLastLoaded);
+    sortComboBox->setCurrentIndex(SettingsCache::instance().getVisualDeckStorageSortingOrder());
 
     // Connect sorting change signal to refresh the file list
     connect(sortComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -40,9 +41,9 @@ void VisualDeckStorageSortWidget::showEvent(QShowEvent *event)
 
 void VisualDeckStorageSortWidget::updateSortOrder()
 {
-    sortOrder = static_cast<SortOrder>(sortComboBox->currentData().toInt());
+    sortOrder = static_cast<SortOrder>(sortComboBox->currentIndex());
     qDebug() << "Sort order updated to: " << sortOrder;
-    SettingsCache::instance().setVisualDeckStorageSortingOrder(sortComboBox->currentData().toInt());
+    SettingsCache::instance().setVisualDeckStorageSortingOrder(sortComboBox->currentIndex());
     emit sortOrderChanged();
 }
 
diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
index aac6b6711..e68add580 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
@@ -27,10 +27,10 @@ signals:
 private:
     enum SortOrder
     {
+        ByName,
         Alphabetical,
         ByLastModified,
         ByLastLoaded,
-        ByName,
     };
     QHBoxLayout *layout;
     VisualDeckStorageWidget *parent;