diff --git a/src/env/zcl_abapgit_settings.clas.abap b/src/env/zcl_abapgit_settings.clas.abap
index 5d45e41e1..2d2d654e0 100644
--- a/src/env/zcl_abapgit_settings.clas.abap
+++ b/src/env/zcl_abapgit_settings.clas.abap
@@ -322,7 +322,11 @@ CLASS zcl_abapgit_settings IMPLEMENTATION.
         WHEN 'Belize'.
           rv_ui_theme = c_ui_theme-belize.
         WHEN OTHERS.
-          rv_ui_theme = c_ui_theme-default.
+          IF lv_frontend_theme CS 'dark'.
+            rv_ui_theme = c_ui_theme-dark.
+          ELSE.
+            rv_ui_theme = c_ui_theme-default.
+          ENDIF.
       ENDCASE.
     ENDIF.
   ENDMETHOD.