diff --git a/js/app/map/map.js b/js/app/map/map.js
index 09ec0875..71d2f228 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -1624,6 +1624,9 @@ define([
             var hoverSystem = $(this).parents('.' + config.systemClass);
             var hoverSystemId = hoverSystem.attr('id');
 
+            // bring system in front (increase zIndex)
+            hoverSystem.updateSystemZIndex();
+
             // get ship counter and calculate expand height
             var userCount = parseInt( hoverSystem.data('userCount') );
 
diff --git a/public/js/v1.1.6/app/map/map.js b/public/js/v1.1.6/app/map/map.js
index 09ec0875..71d2f228 100644
--- a/public/js/v1.1.6/app/map/map.js
+++ b/public/js/v1.1.6/app/map/map.js
@@ -1624,6 +1624,9 @@ define([
             var hoverSystem = $(this).parents('.' + config.systemClass);
             var hoverSystemId = hoverSystem.attr('id');
 
+            // bring system in front (increase zIndex)
+            hoverSystem.updateSystemZIndex();
+
             // get ship counter and calculate expand height
             var userCount = parseInt( hoverSystem.data('userCount') );