diff --git a/src/search/SearchModel.h b/src/search/SearchModel.h
index 343e2597c..08f04b71f 100644
--- a/src/search/SearchModel.h
+++ b/src/search/SearchModel.h
@@ -56,9 +56,9 @@ public:
 	int GetPageCount() { return max(1, (int)(ceil(resultCount/16))); }
 	int GetPageNum() { return currentPage; }
 	std::string GetLastQuery() { return lastQuery; }
-	void SetSort(string sort) { currentSort = sort; notifySortChanged(); }
+	void SetSort(string sort) { if(!updateSaveListWorking) { currentSort = sort; } notifySortChanged(); }
 	string GetSort() { return currentSort; }
-	void SetShowOwn(bool show) { if(show!=showOwn) { showOwn = show; } notifyShowOwnChanged();  }
+	void SetShowOwn(bool show) { if(!updateSaveListWorking) { if(show!=showOwn) { showOwn = show; } } notifyShowOwnChanged();  }
 	bool GetShowOwn() { return showOwn; }
 	void SetShowFavourite(bool show) { if(show!=showFavourite) { showFavourite = show; } notifyShowFavouriteChanged();  }
 	bool GetShowFavourite() { return showFavourite; }
diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index 1322c4b30..422a04036 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -417,9 +417,11 @@ void SearchView::NotifySaveListChanged(SearchModel * sender)
 	{
 		nextButton->Enabled = false;
 		previousButton->Enabled = false;
+		sortButton->Enabled = false;
 	}
 	else
 	{
+		sortButton->Enabled = true;
 		nextButton->Enabled = true;
 		previousButton->Enabled = true;
 	}