3 files changed, 43 insertions, 28 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 44b143e50..39255a632 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/windows/buydialog.h"
 
+#include "configuration.h"
 #include "shopitem.h"
 #include "units.h"
 
@@ -314,6 +315,9 @@ void BuyDialog::init()
 
     instances.push_back(this);
     setVisible(true);
+
+    if (mSortDropDown)
+        mSortDropDown->setSelected(config.getIntValue("buySortOrder"));
 }
 
 BuyDialog::~BuyDialog()
@@ -351,6 +355,38 @@ void BuyDialog::addItem(const int id, const unsigned char color,
     mShopItemList->adjustSize();
 }
 
+void BuyDialog::sort()
+{
+    if (mSortDropDown && mShopItems)
+    {
+        std::vector<ShopItem*> &items = mShopItems->items();
+        switch (mSortDropDown->getSelected())
+        {
+            case 1:
+                std::sort(items.begin(), items.end(), itemPriceBuySorter);
+            break;
+            case 2:
+                std::sort(items.begin(), items.end(), itemNameBuySorter);
+                break;
+            case 3:
+                std::sort(items.begin(), items.end(), itemIdBuySorter);
+                break;
+            case 4:
+                std::sort(items.begin(), items.end(), itemWeightBuySorter);
+                break;
+            case 5:
+                std::sort(items.begin(), items.end(), itemAmountBuySorter);
+                break;
+            case 6:
+                std::sort(items.begin(), items.end(), itemTypeBuySorter);
+                break;
+            case 0:
+            default:
+                break;
+        }
+    }
+}
+
 void BuyDialog::action(const gcn::ActionEvent &event)
 {
     const std::string &eventId = event.getId();
@@ -361,34 +397,9 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
     else if (eventId == "sort")
     {
-        if (mSortDropDown && mShopItems)
-        {
-            std::vector<ShopItem*> &items = mShopItems->items();
-            switch (mSortDropDown->getSelected())
-            {
-                case 1:
-                    std::sort(items.begin(), items.end(), itemPriceBuySorter);
-                    break;
-                case 2:
-                    std::sort(items.begin(), items.end(), itemNameBuySorter);
-                    break;
-                case 3:
-                    std::sort(items.begin(), items.end(), itemIdBuySorter);
-                    break;
-                case 4:
-                    std::sort(items.begin(), items.end(), itemWeightBuySorter);
-                    break;
-                case 5:
-                    std::sort(items.begin(), items.end(), itemAmountBuySorter);
-                    break;
-                case 6:
-                    std::sort(items.begin(), items.end(), itemTypeBuySorter);
-                    break;
-                case 0:
-                default:
-                    break;
-            }
-        }
+        sort();
+        if (mSortDropDown)
+            config.setValue("buySortOrder", mSortDropDown->getSelected());
         return;
     }
 
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 5f19dd5ab..25d8bdb69 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -120,6 +120,8 @@ class BuyDialog final : public Window,
          */
         void setVisible(bool visible);
 
+        void sort();
+
         /**
          * Returns true if any instances exist.
          */
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 7e6fbbb7c..082ebddb0 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -680,6 +680,8 @@ void ShopWindow::showList(const std::string &nick, std::string data) const
             }
         }
     }
+    if (buyDialog)
+        buyDialog->sort();
 }
 
 void ShopWindow::processRequest(const std::string &nick, std::string data,