diff --git a/src/gui/search/SearchView.cpp b/src/gui/search/SearchView.cpp
index d890c0cfb..85ec4c341 100644
--- a/src/gui/search/SearchView.cpp
+++ b/src/gui/search/SearchView.cpp
@@ -486,17 +486,17 @@ void SearchView::NotifySaveListChanged(SearchModel * sender)
 		if (Client::Ref().GetAuthUser().UserID)
 			favButton->Enabled = true;
 	}
-	if (!sender->GetSavesLoaded() || favButton->GetToggleState())
+	ownButton->Enabled = true;
+	sortButton->Enabled = true;
+	if (!Client::Ref().GetAuthUser().UserID || favButton->GetToggleState())
+	{
+		ownButton->Enabled = false;
+	}
+	if (!sender->GetSavesLoaded())
 	{
 		ownButton->Enabled = false;
 		sortButton->Enabled = false;
 	}
-	else
-	{
-		if (Client::Ref().GetAuthUser().UserID)
-			ownButton->Enabled = true;
-		sortButton->Enabled = true;
-	}
 	if (!saves.size())
 	{
 		loadingSpinner->Visible = false;