diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js
index 25d720bab..05b09669b 100644
--- a/src/connectedComponents/ToolbarRow.js
+++ b/src/connectedComponents/ToolbarRow.js
@@ -140,7 +140,7 @@ function _getButtonComponents(toolbarButtons, activeButtons) {
             });
           }
         }}
-        isActive={activeButtons.includes(toolbarButtons.id)}
+        isActive={activeButtons.includes(button.id)}
       />
     );
   });