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..ed9c87f 100644
--- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
+++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java
@@ -89,10 +89,13 @@ public class TitleBarController {
             stage.getScene().setFill(Color.TRANSPARENT);
             stage.getScene().getRoot().getStyleClass().add("root-node");
 
-            controller.themeBtn.setVisible(config.displayThemePicker());
             if (!config.displayMinimizeButton()) {
                 ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn);
             }
+
+            if (!config.displayThemePicker()) {
+                ((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn);
+            }
         });
         return controller;
     }
@@ -107,7 +110,6 @@ public class TitleBarController {
         Platform.runLater(() -> titleLabel.setText(title));
     }
 
-
     public void handleCloseAction(MouseEvent event) {
         config.onCloseClicked();
     }