diff --git a/CHANGES b/CHANGES
index 7a8539e3f..cc077958e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ Bugfixes:
  - GB Memory: Fix starting HDMAs during mode 0
  - Qt: Fix Qt Multimedia audio driver on big endian
  - GBA: Fix IRQs firing after already being cleared
+ - All: Fix fullscreen config option being ignored
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/feature/commandline.c b/src/feature/commandline.c
index 21c2a9af8..9fc75bacb 100644
--- a/src/feature/commandline.c
+++ b/src/feature/commandline.c
@@ -201,7 +201,9 @@ bool _parseGraphicsArg(struct mSubParser* parser, int option, const char* arg) {
 
 void _applyGraphicsArgs(struct mSubParser* parser, struct mCoreConfig* config) {
 	struct mGraphicsOpts* graphicsOpts = parser->opts;
-	mCoreConfigSetOverrideIntValue(config, "fullscreen", graphicsOpts->fullscreen);
+	if (graphicsOpts->fullscreen) {
+		mCoreConfigSetOverrideIntValue(config, "fullscreen", graphicsOpts->fullscreen);
+	}
 }
 
 void usage(const char* arg0, const char* extraOptions) {