diff --git a/config/standard/e.src b/config/standard/e.src
index 8f673739a..3fdc1ae76 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -149,7 +149,7 @@ group "E_Config" struct {
     value "mouse_accel_denominator" int: 1;
     value "mouse_accel_threshold" int: 4;
     value "border_raise_on_mouse_action" int: 1;
-    value "border_raise_on_focus" int: 1;
+    value "border_raise_on_focus" int: 0;
     value "desk_flip_wrap" int: 0;
     value "fullscreen_flip" int: 1;
     value "icon_theme" string: "Tango";
diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c
index 83020835a..524992e8b 100644
--- a/src/modules/wizard/page_060.c
+++ b/src/modules/wizard/page_060.c
@@ -61,6 +61,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
         e_config->winlist_warp_while_selecting = 0;
         e_config->winlist_warp_at_end = 0;
         e_config->winlist_no_warp_on_direction = 1;
+        e_config->border_raise_on_focus = 1;
      }
    else
      {
@@ -71,6 +72,9 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
         e_config->always_click_to_focus = 0;
         e_config->focus_last_focused_per_desktop = 1;
         e_config->pointer_slide = 1;
+        e_config->border_raise_on_focus = 0;
+        e_config->use_auto_raise = 1;
+        e_config->auto_raise_delay = 0.5;
      }
 //   evas_object_del(pg->data);
    return 1;