diff --git a/src/js/popup.js b/src/js/popup.js
index ec90ec3..7e125c6 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1061,15 +1061,18 @@ function updateScopeCell() {
 /******************************************************************************/
 
 function updateMatrixSwitches() {
-    var switches = matrixSnapshot.tSwitches;
+    var count = 0,
+        enabled,
+        switches = matrixSnapshot.tSwitches;
     for ( var switchName in switches ) {
         if ( switches.hasOwnProperty(switchName) === false ) {
             continue;
         }
-        uDom('#mtxSwitch_' + switchName).toggleClass('switchTrue', switches[switchName]);
-        
+        if ( (enabled = switches[switchName]) ) { count += 1; }
+        uDom('#mtxSwitch_' + switchName).toggleClass('switchTrue', enabled);
     }
-    var count = matrixSnapshot.blockedCount;
+    uDom('#buttonMtxSwitches').descendants('span.badge').text(count.toLocaleString());
+    count = matrixSnapshot.blockedCount;
     var button = uDom('#mtxSwitch_matrix-off');
     button.descendants('span.badge').text(count.toLocaleString());
     button.attr('data-tip', button.attr('data-tip').replace('{{count}}', count));
diff --git a/src/popup.html b/src/popup.html
index 15d9ee1..3634b72 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -31,7 +31,7 @@
         <div class="dropdown-menu-capture"></div>
         <button id="mtxSwitch_matrix-off" type="button" class="fa scopeRel tip-anchor-left" data-i18n-tip="matrixMtxButtonTip">&#xf011;<span class="badge"></span></button>
         <div style="display: inline-block; position: relative">
-            <button id="buttonMtxSwitches" type="button" class="dropdown-menu-button fa scopeRel" tabindex="-1">&#xf142;</button>
+            <button id="buttonMtxSwitches" type="button" class="dropdown-menu-button fa scopeRel" tabindex="-1">&#xf142;<span class="badge"></span></button>
             <div class="dropdown-menu">
                 <ul id="mtxSwitches">
                     <li id="mtxSwitch_ua-spoof" class="dropdown-menu-entry" data-i18n="matrixSwitchUASpoof">