diff --git a/frontend/src/app/(dashboard)/agents/config/[agentId]/page.tsx b/frontend/src/app/(dashboard)/agents/config/[agentId]/page.tsx
index 8eac67b5..af67dfe2 100644
--- a/frontend/src/app/(dashboard)/agents/config/[agentId]/page.tsx
+++ b/frontend/src/app/(dashboard)/agents/config/[agentId]/page.tsx
@@ -320,7 +320,8 @@ export default function AgentConfigurationPageRefactored() {
                       onStyleChange={handleStyleChange}
                     />
                   </TabsContent>
-                  <TabsContent value="configuration" className="flex-1 h-0 m-0 overflow-y-auto">
+                                  <TabsContent value="configuration" className="flex-1 h-0 m-0 overflow-y-auto">
+                  <div className="h-full">
                     <ConfigurationTab
                       agentId={agentId}
                       displayData={displayData}
@@ -329,7 +330,8 @@ export default function AgentConfigurationPageRefactored() {
                       onFieldChange={handleFieldChange}
                       onMCPChange={handleMCPChange}
                     />
-                  </TabsContent>
+                  </div>
+                </TabsContent>
                 </Tabs>
               </div>
             </div>
@@ -427,14 +429,16 @@ export default function AgentConfigurationPageRefactored() {
                 </TabsContent>
 
                 <TabsContent value="configuration" className="flex-1 h-0 m-0 overflow-y-auto">
-                  <ConfigurationTab
-                    agentId={agentId}
-                    displayData={displayData}
-                    versionData={versionData}
-                    isViewingOldVersion={isViewingOldVersion}
-                    onFieldChange={handleFieldChange}
-                    onMCPChange={handleMCPChange}
-                  />
+                  <div className="h-full">
+                    <ConfigurationTab
+                      agentId={agentId}
+                      displayData={displayData}
+                      versionData={versionData}
+                      isViewingOldVersion={isViewingOldVersion}
+                      onFieldChange={handleFieldChange}
+                      onMCPChange={handleMCPChange}
+                    />
+                  </div>
                 </TabsContent>
               </Tabs>
             </div>
diff --git a/frontend/src/components/agents/agent-config-modal.tsx b/frontend/src/components/agents/agent-config-modal.tsx
index 0ecba2fb..0fe0cbf8 100644
--- a/frontend/src/components/agents/agent-config-modal.tsx
+++ b/frontend/src/components/agents/agent-config-modal.tsx
@@ -259,8 +259,8 @@ export const AgentConfigModal: React.FC<AgentConfigModalProps> = ({
               </div>
             </TabsContent>
 
-            <TabsContent value="triggers" className="flex-1 m-0 mt-0 overflow-y-auto overflow-hidden">
-              <div className="h-full">
+            <TabsContent value="triggers" className="flex-1 m-0 mt-0 overflow-y-auto">
+              <div className="h-full p-4">
                 {selectedAgentId ? (
                   <AgentTriggersConfiguration agentId={selectedAgentId} />
                 ) : (
@@ -271,8 +271,8 @@ export const AgentConfigModal: React.FC<AgentConfigModalProps> = ({
               </div>
             </TabsContent>
 
-            <TabsContent value="workflows" className="flex-1 m-0 mt-0 overflow-y-auto overflow-hidden">
-              <div className="h-full">
+            <TabsContent value="workflows" className="flex-1 m-0 mt-0 overflow-y-auto">
+              <div className="h-full p-4">
                 {selectedAgentId ? (
                   <AgentWorkflowsConfiguration
                     agentId={selectedAgentId}
diff --git a/frontend/src/components/agents/config/configuration-tab.tsx b/frontend/src/components/agents/config/configuration-tab.tsx
index 58756953..9327a2ec 100644
--- a/frontend/src/components/agents/config/configuration-tab.tsx
+++ b/frontend/src/components/agents/config/configuration-tab.tsx
@@ -42,7 +42,7 @@ export function ConfigurationTab({
   onMCPChange,
 }: ConfigurationTabProps) {
   return (
-    <div className="p-4">
+    <div className="p-4 pb-8">
       <Accordion type="single" collapsible defaultValue="system" className="space-y-2">
         <AccordionItem 
           value="system"