diff --git a/src/studio/config.c b/src/studio/config.c
index b2a026a2c..c4e2eaf41 100644
--- a/src/studio/config.c
+++ b/src/studio/config.c
@@ -385,7 +385,11 @@ void initConfig(Config* config, tic_mem* tic, FileSystem* fs)
 
 void freeConfig(Config* config)
 {
+#if defined(CRT_SHADER_SUPPORT)
+
     free((void*)config->data.shader.vertex);
     free((void*)config->data.shader.pixel);
+#endif
+
     free(config);
 }
diff --git a/src/studio/system.h b/src/studio/system.h
index c2c8b2d73..8079a30c6 100644
--- a/src/studio/system.h
+++ b/src/studio/system.h
@@ -151,15 +151,14 @@ typedef struct
 
 #if defined(CRT_SHADER_SUPPORT)
     bool crtMonitor;
-#endif
-    
-    bool goFullscreen;
-
     struct
     {
         const char* vertex;
         const char* pixel;
     } shader;
+#endif
+    
+    bool goFullscreen;
 
     const tic_cartridge* cart;