diff --git a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionToolbarItem.tsx b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionToolbarItem.tsx
index 1f5639191b2..3839ebcfcaa 100644
--- a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionToolbarItem.tsx
+++ b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionToolbarItem.tsx
@@ -12,7 +12,13 @@ import { ExtensionToolbarItemButton } from './ExtensionToolbarItemButton';
 
 type ComponentWithPluginId = ExtensionInfo & { pluginId: string };
 
-export function ExtensionToolbarItem() {
+type Props = {
+  compact?: boolean;
+};
+
+const compactAllowedComponents = ['grafana-assistant-app'];
+
+export function ExtensionToolbarItem({ compact }: Props) {
   const { availableComponents, dockedComponentId, setDockedComponentId } = useExtensionSidebarContext();
 
   if (availableComponents.size === 0) {
@@ -27,6 +33,12 @@ export function ExtensionToolbarItem() {
       const componentId = getComponentIdFromComponentMeta(pluginId, component);
       const isActive = dockedComponentId === componentId;
 
+      // we now allow more components in the extension sidebar
+      // in compact mode we only want to allow the Assistant app right now
+      if (compact && !compactAllowedComponents.includes(pluginId)) {
+        return null;
+      }
+
       return (
         <ExtensionToolbarItemButton
           key={pluginId}
diff --git a/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx b/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
index 644487f6f03..71211e4b535 100644
--- a/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
+++ b/public/app/core/components/AppChrome/TopBar/SingleTopBar.tsx
@@ -104,7 +104,7 @@ export const SingleTopBar = memo(function SingleTopBar({
             </Dropdown>
           )}
           <NavToolbarSeparator />
-          {!isSmallScreen && <ExtensionToolbarItem />}
+          {!isSmallScreen && <ExtensionToolbarItem compact={isSmallScreen} />}
           {!showToolbarLevel && actions}
           {!contextSrv.user.isSignedIn && <SignInLink />}
           <InviteUserButton />