diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp
index a043e561..a04cd694 100644
--- a/cockatrice/src/gameselector.cpp
+++ b/cockatrice/src/gameselector.cpp
@@ -33,7 +33,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
     if (_room)
         gameListView->header()->hideSection(gameListModel->roomColIndex());
 
-    GameTypeMap gameTypeMap;
     if (room)
         gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId());
 
@@ -87,9 +86,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
 
 void GameSelector::actSetFilter()
 {
-	GameTypeMap gameTypeMap;
-	if (room)
-	    gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId());
     DlgFilterGames dlg(gameTypeMap, gameListProxyModel, this);
 
     if (!dlg.exec())
@@ -111,6 +107,7 @@ void GameSelector::actClearFilter()
     clearFilterButton->setEnabled(false);
 
     gameListProxyModel->resetFilterParameters();
+    gameListProxyModel->saveFilterParameters(gameTypeMap);
 }
 
 void GameSelector::actCreate()
diff --git a/cockatrice/src/gameselector.h b/cockatrice/src/gameselector.h
index 47a9c395..8e043850 100644
--- a/cockatrice/src/gameselector.h
+++ b/cockatrice/src/gameselector.h
@@ -34,6 +34,7 @@ private:
     GamesModel *gameListModel;
     GamesProxyModel *gameListProxyModel;
     QPushButton *filterButton, *clearFilterButton, *createButton, *joinButton, *spectateButton;
+    GameTypeMap gameTypeMap;
 public:
     GameSelector(AbstractClient *_client, const TabSupervisor *_tabSupervisor, TabRoom *_room, const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QWidget *parent = 0);
     void retranslateUi();