diff --git a/src/window_options.c b/src/window_options.c
index ca760d8980..9d89125b9e 100644
--- a/src/window_options.c
+++ b/src/window_options.c
@@ -517,6 +517,14 @@ static void window_options_dropdown()
 		break;
 	case WIDX_FULLSCREEN_DROPDOWN:
 		if (dropdownIndex != gGeneral_config.fullscreen_mode){
+			if (dropdownIndex == 2){
+				w->disabled_widgets |= (1 << WIDX_RESOLUTION_DROPDOWN);
+				w->disabled_widgets |= (1 << WIDX_RESOLUTION);
+			}
+			else {
+				w->disabled_widgets &= ~(1 << WIDX_RESOLUTION_DROPDOWN);
+				w->disabled_widgets &= ~(1 << WIDX_RESOLUTION);
+			}
 			osinterface_set_fullscreen_mode(dropdownIndex);
 		}
 		break;