diff --git a/binaries/data/mods/mod/gui/common/modern/setup.xml b/binaries/data/mods/mod/gui/common/modern/setup.xml
index 45c5a05481..33e7d832ab 100644
--- a/binaries/data/mods/mod/gui/common/modern/setup.xml
+++ b/binaries/data/mods/mod/gui/common/modern/setup.xml
@@ -32,7 +32,7 @@
 			textcolor="255 255 255"
 	/>
 
-	<tooltip name="sliderTooltip"
+	<tooltip name="tooltipInstant"
 		anchor="top"
 		buffer_zone="4"
 		delay="0"
diff --git a/binaries/data/mods/mod/gui/common/modern/styles.xml b/binaries/data/mods/mod/gui/common/modern/styles.xml
index 17193f330f..51e328fb44 100644
--- a/binaries/data/mods/mod/gui/common/modern/styles.xml
+++ b/binaries/data/mods/mod/gui/common/modern/styles.xml
@@ -144,7 +144,7 @@
 		sprite="ModernSliderButton"
 		sprite_bar="ModernSliderLine"
 		button_width="20"
-		tooltip_style="sliderTooltip"
+		tooltip_style="tooltipInstant"
 	/>
 	<style name="ModernButtonRed"
 		sprite="ModernButtonRed"
diff --git a/binaries/data/mods/public/gui/options/options.js b/binaries/data/mods/public/gui/options/options.js
index da33be0c72..192922c432 100644
--- a/binaries/data/mods/public/gui/options/options.js
+++ b/binaries/data/mods/public/gui/options/options.js
@@ -140,7 +140,11 @@ var g_OptionType = {
 		"initGUI": (option, control) => {
 			control.list = option.list.map(e => e.label);
 			control.list_data = option.list.map(e => e.value);
-		},
+			control.onHoverChange = () => {
+				let item = option.list[control.hovered];
+				control.tooltip = item && item.tooltip || option.tooltip;
+			};
+		}
 	},
 	"slider":
 	{
diff --git a/binaries/data/mods/public/gui/options/options.json b/binaries/data/mods/public/gui/options/options.json
index 70bef23a1c..7fe922eb2e 100644
--- a/binaries/data/mods/public/gui/options/options.json
+++ b/binaries/data/mods/public/gui/options/options.json
@@ -371,9 +371,21 @@
 				"tooltip": "Automatically assign joining clients to free player slots during the match setup.",
 				"config": "gui.gamesetup.assignplayers",
 				"list": [
-					{ "value": "everyone", "label": "Everyone" },
-					{ "value": "buddies", "label": "Buddies" },
-					{ "value": "disabled", "label": "Disabled" }
+					{
+						"value": "everyone",
+						"label": "Everyone",
+						"tooltip": "Players joining the match will be assigned if there is a free slot."
+					},
+					{
+						"value": "buddies",
+						"label": "Buddies",
+						"tooltip": "Players joining the match will only be assigned if they are a buddy of the host and if there is a free slot."
+					},
+					{
+						"value": "disabled",
+						"label": "Disabled",
+						"tooltip": "Players only receive a slot when the host assigns them explicitly."
+					}
 				]
 			}
 		]
diff --git a/binaries/data/mods/public/gui/options/options.xml b/binaries/data/mods/public/gui/options/options.xml
index b44cebcab2..c18992d274 100644
--- a/binaries/data/mods/public/gui/options/options.xml
+++ b/binaries/data/mods/public/gui/options/options.xml
@@ -32,7 +32,7 @@
 						<object type="image" size="-39 5 -5 100%-5"/>
 					</object>
 					<object name="option_control_number[n]" size="65% 0 100%-8 100%" type="input" style="ModernInput"/>
-					<object name="option_control_dropdown[n]" size="65% 0 100%-8 100%" type="dropdown" style="ModernDropDown"/>
+					<object name="option_control_dropdown[n]" size="65% 0 100%-8 100%" type="dropdown" style="ModernDropDown" tooltip_style="tooltipInstant"/>
 					<object name="option_control_slider[n]" size="65% 0 100%-8 100%" type="slider" style="ModernSlider"/>
 				</object>
 			</repeat>