diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 10a0dd0165..d326855661 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1541,7 +1541,11 @@ struct GameSettingsWindow : Window {
 			/* Save the correct currency-translated value */
 			if (sd->desc.flags & SGF_CURRENCY) value /= _currency->rate;
 
-			SetSettingValue(this->valuewindow_entry->d.entry.index, value);
+			if ((sd->desc.flags & SGF_PER_COMPANY) != 0) {
+				SetCompanySetting(this->valuewindow_entry->d.entry.index, value);
+			} else {
+				SetSettingValue(this->valuewindow_entry->d.entry.index, value);
+			}
 			this->SetDirty();
 		}
 	}