diff --git a/src/connectedComponents/ConnectedToolbarRow.js b/src/connectedComponents/ConnectedToolbarRow.js
index b887ff9c4..05a74a798 100644
--- a/src/connectedComponents/ConnectedToolbarRow.js
+++ b/src/connectedComponents/ConnectedToolbarRow.js
@@ -18,7 +18,6 @@ const mapStateToProps = state => {
     viewportSpecificData[activeViewportIndex].plugin;
   const pluginInActiveViewport =
     pluginInLayout || pluginInViewportData || defaultPlugin;
-  //     const extensionData = state.extensions[pluginInActiveViewport];
 
   return {
     pluginId: pluginInActiveViewport,
diff --git a/src/connectedComponents/ToolbarRow.js b/src/connectedComponents/ToolbarRow.js
index 1494d8275..90ea39acf 100644
--- a/src/connectedComponents/ToolbarRow.js
+++ b/src/connectedComponents/ToolbarRow.js
@@ -7,6 +7,7 @@ import ConnectedPluginSwitch from './ConnectedPluginSwitch.js';
 import { MODULE_TYPES } from 'ohif-core';
 import PropTypes from 'prop-types';
 import { RoundedButtonGroup } from 'react-viewerbase';
+import { extensionManager } from './../App.js';
 
 class ToolbarRow extends Component {
   static propTypes = {
@@ -55,17 +56,14 @@ class ToolbarRow extends Component {
       ? rightSidebarToggle[0].value
       : null;
 
-    const currentPluginId = this.props.pluginId;
-
-    const plugin = availablePlugins.find(entry => {
-      return (
-        entry.type === MODULE_TYPES.TOOLBAR && entry.id === currentPluginId
-      );
-    });
+    const availableToolbarModules = extensionManager[MODULE_TYPES.TOOLBAR];
+    const toolbarModuleDefinition = availableToolbarModules.find(
+      moduleDefinition => moduleDefinition.extensionId === this.props.pluginId
+    );
 
     let pluginComp;
-    if (plugin) {
-      const PluginComponent = plugin.component;
+    if (toolbarModuleDefinition) {
+      const PluginComponent = toolbarModuleDefinition.module;
 
       pluginComp = <PluginComponent />;
     }