diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
index aeefe0d..1e4bf0b 100644
--- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
+++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
@@ -93,6 +93,10 @@ public class TitleBarController {
             if (!config.displayMinimizeButton()) {
                 ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn);
             }
+
+            if (!config.displayThemePicker()) {
+                ((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn);
+            }
         });
         return controller;
     }