diff --git a/Composer/packages/client/src/pages/design/DebugPanel/DebugPanel.tsx b/Composer/packages/client/src/pages/design/DebugPanel/DebugPanel.tsx
index 7e6094d07b..6db13eb576 100644
--- a/Composer/packages/client/src/pages/design/DebugPanel/DebugPanel.tsx
+++ b/Composer/packages/client/src/pages/design/DebugPanel/DebugPanel.tsx
@@ -81,9 +81,6 @@ export const DebugPanel: React.FC = () => {
                   padding: 0,
                   fontSize: FontSizes.size12,
                 }}
-                onClick={() => {
-                  onExpandPanel(key);
-                }}
               >
                 {element}
               </Label>
@@ -108,6 +105,9 @@ export const DebugPanel: React.FC = () => {
             fontSize: FontSizes.size14,
           },
         }}
+        onLinkClick={(pivotItem) => {
+          if (pivotItem?.props.itemKey != null) onExpandPanel(pivotItem?.props.itemKey as DebugDrawerKeys);
+        }}
       >
         {tabTitles}
       </Pivot>