diff --git a/module/block/css/guideblock.ui.css b/module/block/css/guideblock.ui.css
index a0addd339e..06964d31a4 100644
--- a/module/block/css/guideblock.ui.css
+++ b/module/block/css/guideblock.ui.css
@@ -31,6 +31,8 @@
 
 .guide-block .block {background: rgba(230, 240, 255, 0.4);}
 .guide-block .block:hover {box-shadow: 0 0 14px rgba(0, 0, 0, 0.12);}
+.guide-block .block.active {box-shadow: 0 0 0 2px #2E7FFF; border-radius: 2px;}
+.guide-block .theme-switch .block.active {box-shadow: none; border-radius: 0;}
 
 .preference-menu.picker-menu-list {padding: 0.25rem;}
 .preference-menu.picker-menu-list .menu-item {padding: 0.25rem;}
diff --git a/module/block/js/guideblock.ui.js b/module/block/js/guideblock.ui.js
index bfa209e392..8e16f1f058 100644
--- a/module/block/js/guideblock.ui.js
+++ b/module/block/js/guideblock.ui.js
@@ -31,7 +31,7 @@ $('.vision-switch .block.state').on('click', '.vision-block', function()
 
 $('.theme-switch .block').off('click').on('click', '.theme-block', function()
 {
-    $('.block').removeClass('active');
+    $(this).closest('.tab-pane').find('.block').removeClass('active');
     selectTheme($(this).attr('data-theme'));
     $(this).closest('.block').addClass('active');
 })