diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 658ef5214..d3ffc57dd 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -416,7 +416,8 @@ e_border_shade(E_Border *bd)
 	     bd->changes.shading = 1;
 	     bd->changed = 1;
 
-	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_S);
+	     /* FIXME: this assumes shading upwards */
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
 	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
 	     edje_object_signal_emit(bd->bg_object, "shading", "");
 	  }
@@ -447,7 +448,8 @@ e_border_unshade(E_Border *bd)
 	     bd->changes.shading = 1;
 	     bd->changed = 1;
 
-	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_S);
+	     /* FIXME: this assumes shading upwards */
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
 	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
 	     edje_object_signal_emit(bd->bg_object, "unshading", "");
 	  }
@@ -1845,6 +1847,7 @@ _e_border_eval(E_Border *bd)
 					bd->client_inset.l, bd->client_inset.t,
 					bd->w - (bd->client_inset.l + bd->client_inset.r),
 					bd->h - (bd->client_inset.t + bd->client_inset.b));
+	     /* FIXME: this assumes shading upwards */
 	     ecore_x_window_move_resize(bd->client.win, 0, bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h,
 					bd->client.w, bd->client.h);
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
@@ -1857,6 +1860,7 @@ _e_border_eval(E_Border *bd)
 	     evas_obscured_clear(bd->bg_evas);
 	     ecore_x_window_move_resize(bd->win, bd->x, bd->y, bd->w, bd->h);
 	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
+	     /* FIXME: this assumes shading upwards */
 	     ecore_x_window_move_resize(bd->client.win, 0, bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h,
 					bd->client.w, bd->client.h);
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
@@ -1910,6 +1914,7 @@ _e_border_eval(E_Border *bd)
 					bd->client_inset.l, bd->client_inset.t,
 					bd->w - (bd->client_inset.l + bd->client_inset.r),
 					bd->h - (bd->client_inset.t + bd->client_inset.b));
+	     /* FIXME: this assumes shading upwards */
 	     ecore_x_window_move_resize(bd->client.win, 0, bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h,
 					bd->client.w, bd->client.h);
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
@@ -1921,6 +1926,7 @@ _e_border_eval(E_Border *bd)
 	     evas_obscured_clear(bd->bg_evas);
 	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
 	     ecore_x_window_resize(bd->win, bd->w, bd->h);
+	     /* FIXME: this assumes shading upwards */
 	     ecore_x_window_move_resize(bd->client.win, 0, bd->h - (bd->client_inset.t + bd->client_inset.b) - bd->client.h,
 					bd->client.w, bd->client.h);
 	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 956c3de9b..9fc39f3e4 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -92,7 +92,7 @@ e_config_init(void)
    E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_thresthold, 1.0, 2000.0);
    E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
    E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
-   E_CONFIG_LIMIT(e_config->border_shade_speed, 1, 20000.0);
+   E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0);
    E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
    E_CONFIG_LIMIT(e_config->image_cache, 0, 256 * 1024);
    E_CONFIG_LIMIT(e_config->font_cache, 0, 32 * 1024);