diff --git a/sample/text_only_3.tint2rc b/sample/text_only_3.tint2rc
index 635a172..b58f54b 100644
--- a/sample/text_only_3.tint2rc
+++ b/sample/text_only_3.tint2rc
@@ -12,7 +12,7 @@ border_color = #000000 0
 # ID 2
 rounded = 1
 border_width = 0
-background_color = #F6B655 86
+background_color = #F6B655 85
 border_color = #CCCCCC 40
 
 # Panel
@@ -31,7 +31,7 @@ autohide = 0
 autohide_show_timeout = 0.0
 autohide_hide_timeout = 0.0
 autohide_height = 0
-strut_policy = none
+strut_policy = follow_size
 
 # Taskbar
 taskbar_mode = single_desktop
@@ -76,7 +76,7 @@ systray_icon_asb = 100 -90 -15
 # Clock
 time1_format = %H:%M
 time1_font = sans 13
-clock_font_color = #FFFFFF 86
+clock_font_color = #FFFFFF 85
 clock_padding = 2 0
 clock_background_id = 0
 
@@ -106,4 +106,4 @@ battery_font_color = #FFFFFF 100
 battery_padding = 2 0
 battery_background_id = 0
 
-# End of config
\ No newline at end of file
+# End of config
diff --git a/sample/text_only_4.tint2rc b/sample/text_only_4.tint2rc
index db424a6..6bbd8cd 100644
--- a/sample/text_only_4.tint2rc
+++ b/sample/text_only_4.tint2rc
@@ -7,12 +7,12 @@
 rounded = 3
 border_width = 1
 background_color = #000000 40
-border_color = #D1D1D1 31
+border_color = #D1D1D1 30
 
 # ID 2
 rounded = 3
 border_width = 1
-background_color = #000000 52
+background_color = #000000 51
 border_color = #D1D1D1 40
 
 # Panel
@@ -31,7 +31,7 @@ autohide = 0
 autohide_show_timeout = 0.0
 autohide_hide_timeout = 0.0
 autohide_height = 0
-strut_policy = none
+strut_policy = follow_size
 
 # Taskbar
 taskbar_mode = single_desktop
@@ -60,8 +60,8 @@ task_iconified_icon_asb = 100 0 0
 # Fonts
 task_font = sans bold 7.5
 task_font_color = #FFFFFF 60
-task_active_font_color = #FFFFFF 87
-task_urgent_font_color = #FFFFFF 87
+task_active_font_color = #FFFFFF 86
+task_urgent_font_color = #FFFFFF 86
 task_iconified_font_color = #FFFFFF 60
 font_shadow = 0
 
@@ -99,4 +99,4 @@ battery_font_color = #FFFFFF 100
 battery_padding = 1 0
 battery_background_id = 0
 
-# End of config
\ No newline at end of file
+# End of config
diff --git a/src/tint.c b/src/tint.c
index 7388035..cbd7dca 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -318,7 +318,8 @@ void event_button_press (XEvent *e)
 	}
 	task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
 
-	XLowerWindow (server.dsp, panel->main_win);
+	if (panel_layer == BOTTOM_LAYER)
+		XLowerWindow (server.dsp, panel->main_win);
 }
 
 void event_button_motion_notify (XEvent *e)
@@ -383,7 +384,8 @@ void event_button_release (XEvent *e)
 
 	if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
 		forward_click(e);
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
 		return;
 	}
@@ -412,7 +414,8 @@ void event_button_release (XEvent *e)
 
 	if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
 		clock_action(e->xbutton.button);
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
 		return;
 	}
@@ -420,7 +423,8 @@ void event_button_release (XEvent *e)
 	Taskbar *tskbar;
 	if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) {
 		// TODO: check better solution to keep window below
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
 		return;
 	}
@@ -442,7 +446,8 @@ void event_button_release (XEvent *e)
 	window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
 
 	// to keep window below
-	XLowerWindow (server.dsp, panel->main_win);
+	if (panel_layer == BOTTOM_LAYER)
+		XLowerWindow (server.dsp, panel->main_win);
 }