diff --git a/src/components/common/FadeModal.jsx b/src/components/common/FadeModal.jsx
index cc176b9..a87b44f 100644
--- a/src/components/common/FadeModal.jsx
+++ b/src/components/common/FadeModal.jsx
@@ -1,4 +1,4 @@
-import { Modal, ModalDialog, ModalOverflow } from '@mui/joy'
+import { Modal, ModalDialog, ModalOverflow, Typography } from '@mui/joy'
 import { Z_INDEX } from '../../constants/zIndex'
 
 /**
@@ -10,8 +10,10 @@ const FadeModal = ({
   onClose,
   children,
   size = 'md',
-  fullWidth = false,
+  fullWidth = true,
   backdropBlur = true,
+  title,
+  footer,
   ...props
 }) => {
   // Filter out props that shouldn't be passed to Modal
@@ -76,7 +78,13 @@ const FadeModal = ({
             },
           }}
         >
-          {children}
+          {title && (
+            <Typography level='title-lg' sx={{ fontWeight: 600, mb: 2 }}>
+              {title}
+            </Typography>
+          )}
+          <div style={{ flex: 1, overflow: 'auto' }}>{children}</div>
+          {footer && <div style={{ marginTop: 16 }}>{footer}</div>}
         </ModalDialog>
       </ModalOverflow>
     </Modal>
diff --git a/src/views/Modals/Inputs/AdvancedFilterBuilder.jsx b/src/views/Modals/Inputs/AdvancedFilterBuilder.jsx
index 9be4f0a..af5ee54 100644
--- a/src/views/Modals/Inputs/AdvancedFilterBuilder.jsx
+++ b/src/views/Modals/Inputs/AdvancedFilterBuilder.jsx
@@ -400,6 +400,7 @@ const AdvancedFilterBuilder = ({
       open={isOpen}
       onClose={onClose}
       size='lg'
+      fullWidth={true}
       title={editingFilter ? 'Edit Filter' : 'Create Advanced Filter'}
       footer={
         <Box sx={{ display: 'flex', gap: 1, justifyContent: 'flex-end' }}>