diff --git a/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx b/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
index b930b314051..02c0033c184 100644
--- a/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
+++ b/public/app/features/alerting/unified/rule-list/RuleList.v2.tsx
@@ -20,14 +20,14 @@ function RuleList() {
   const { viewMode, handleViewChange } = useListViewMode();
 
   return (
-    <>
+    <Stack direction="column">
       <RulesFilter viewMode={viewMode} onViewModeChange={handleViewChange} />
       {viewMode === 'list' ? (
         <FilterView filterState={filterState} />
       ) : (
         <GroupedView groupFilter={filterState.groupName} namespaceFilter={filterState.namespace} />
       )}
-    </>
+    </Stack>
   );
 }
 
diff --git a/public/app/features/alerting/unified/rule-list/components/DataSourceSection.tsx b/public/app/features/alerting/unified/rule-list/components/DataSourceSection.tsx
index 1750b3c68dc..8416e3e3d84 100644
--- a/public/app/features/alerting/unified/rule-list/components/DataSourceSection.tsx
+++ b/public/app/features/alerting/unified/rule-list/components/DataSourceSection.tsx
@@ -74,6 +74,8 @@ export const DataSourceSection = ({
                   </Text>
                 )}
 
+                <Spacer />
+
                 {Boolean(error) && (
                   <Toggletip
                     title={t('alerting.rule-list.ds-error.title', 'Cannot load rules for this datasource')}
@@ -85,7 +87,6 @@ export const DataSourceSection = ({
                   </Toggletip>
                 )}
 
-                <Spacer />
                 {configureLink && (
                   <WithReturnButton
                     title={t('alerting.rule-list.return-button.title', 'Alert rules')}