diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
index a79b728d6..7494e108b 100644
--- a/src/bin/e_xsettings.c
+++ b/src/bin/e_xsettings.c
@@ -665,6 +665,8 @@ _e_xsettings_stop(void)
 {
    Setting *s;
 
+   _e_xsettings_dpi_set();
+
    if (!running) return;
 
    if (manager->timer_retry)
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index 983d45bcf..44b8a9aa5 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -158,7 +158,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_config->xsettings.match_e17_theme = cfdata->match_e17_theme;
    e_config->xsettings.enabled = cfdata->enable_xsettings;
 
-   if (cfdata->enable_xsettings_dpi)
+   if (cfdata->enable_xsettings && cfdata->enable_xsettings_dpi)
      e_config->xsettings.dpi.enabled = 1;
    else
      e_config->xsettings.dpi.enabled = 0;