diff --git a/less/chats.less b/less/chats.less
index 4c4520c..afd463b 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -336,7 +336,7 @@
 }
 
 .chat-modal {
-	z-index: 10000;
+	z-index: @zindex-modal;
 }
 
 /* Chat modal specific styles */
diff --git a/less/modules/taskbar.less b/less/modules/taskbar.less
index 2c1d367..949bacf 100644
--- a/less/modules/taskbar.less
+++ b/less/modules/taskbar.less
@@ -1,13 +1,17 @@
 @import "../keyframes";
 
+.modal-focused {
+	z-index: @zindex-modal + 5;
+}
+
 .taskbar {
 	display: none;
-	z-index: 10001;
+	z-index: @zindex-popover;
 	left: auto;
 
 	// Bootswatch fix
 	&.navbar-fixed-bottom {
-		z-index: 10001;
+		z-index: @zindex-popover;
 		left: auto;
 	}