diff --git a/src/tint.c b/src/tint.c
index bc915eb..5c96d54 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -524,6 +524,9 @@ void event_property_notify (XEvent *e)
 		else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
 			if (!taskbar_enabled) return;
 			server.nb_desktop = server_get_number_of_desktop ();
+			if (server.nb_desktop <= server.desktop) {
+				server.desktop = server.nb_desktop-1;
+			}
 			cleanup_taskbar();
 			init_taskbar();
 			for (i=0 ; i < nb_panel ; i++) {