diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1896,6 +1896,7 @@ struct GameSettingsWindow : QueryStringB
 	bool closing_dropdown;             ///< True, if the dropdown list is currently closing.
 
 	StringFilter string_filter;        ///< Text filter for settings.
+	bool manually_changed_folding;     ///< Whether the user expanded/collapsed something manually.
 
 	Scrollbar *vscroll;
 
@@ -1918,6 +1919,7 @@ struct GameSettingsWindow : QueryStringB
 		this->last_clicked = NULL;
 		this->valuedropdown_entry = NULL;
 		this->closing_dropdown = false;
+		this->manually_changed_folding = false;
 
 		this->CreateNestedTree(desc);
 		this->vscroll = this->GetScrollbar(WID_GS_SCROLLBAR);
@@ -2022,11 +2024,13 @@ struct GameSettingsWindow : QueryStringB
 	{
 		switch (widget) {
 			case WID_GS_EXPAND_ALL:
+				this->manually_changed_folding = true;
 				_settings_main_page.UnFoldAll();
 				this->InvalidateData();
 				break;
 
 			case WID_GS_COLLAPSE_ALL:
+				this->manually_changed_folding = true;
 				_settings_main_page.FoldAll();
 				this->InvalidateData();
 				break;
@@ -2049,6 +2053,8 @@ struct GameSettingsWindow : QueryStringB
 			this->SetDisplayedHelpText(NULL);
 			pe->d.sub.folded = !pe->d.sub.folded; // Flip 'folded'-ness of the sub-page
 
+			this->manually_changed_folding = true;
+
 			this->InvalidateData();
 			return;
 		}
@@ -2278,6 +2284,11 @@ struct GameSettingsWindow : QueryStringB
 	virtual void OnOSKInput(int wid)
 	{
 		string_filter.SetFilterTerm(this->edit_str_buf);
+		if (!string_filter.IsEmpty() && !this->manually_changed_folding) {
+			/* User never expanded/collapsed single pages and entered a filter term.
+			 * Expand everything, to save weird expand clicks, */
+			_settings_main_page.UnFoldAll();
+		}
 		this->InvalidateData();
 	}