diff --git a/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx b/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
index 2076e223aa3..825a335f154 100644
--- a/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
+++ b/src/vs/workbench/browser/positronComponents/positronModalPopup/positronModalPopup.tsx
@@ -86,11 +86,10 @@ export interface PositronModalPopupProps {
 	readonly height: number | 'min-content';
 	readonly minHeight?: number | 'auto';
 	readonly maxHeight?: number | 'none';
+	readonly fixedHeight?: boolean;
 	readonly focusableElementSelectors?: string;
 	readonly keyboardNavigationStyle: KeyboardNavigationStyle;
 	readonly onAccept?: () => void;
-
-	yaba?: boolean;
 }
 
 /**
@@ -121,9 +120,6 @@ export const PositronModalPopup = (props: PropsWithChildren<PositronModalPopupPr
 		const { clientWidth: documentWidth, clientHeight: documentHeight } =
 			DOM.getWindow(popupRef.current).document.documentElement;
 
-		// Create the popup layout.
-		const popupLayout = new PopupLayout();
-
 		// Calculate the anchor position and size.
 		let anchorX: number;
 		let anchorY: number;
@@ -146,6 +142,9 @@ export const PositronModalPopup = (props: PropsWithChildren<PositronModalPopupPr
 		const leftAreaWidth = anchorX + anchorWidth - LAYOUT_MARGIN;
 		const rightAreaWidth = documentWidth - anchorX - LAYOUT_MARGIN;
 
+		// Create the popup layout.
+		const popupLayout = new PopupLayout();
+
 		/**
 		 * Positions the popup aligned with the left edge of the anchor element.
 		 */
@@ -193,7 +192,7 @@ export const PositronModalPopup = (props: PropsWithChildren<PositronModalPopupPr
 			// Position the popup at the bottom.
 			const positionBottom = () => {
 				popupLayout.top = anchorY + anchorHeight + LAYOUT_OFFSET;
-				if (props.yaba) {
+				if (props.fixedHeight) {
 					popupLayout.top = Math.min(popupLayout.top, documentHeight - layoutHeight - LAYOUT_MARGIN);
 				} else {
 					popupLayout.maxHeight = documentHeight - popupLayout.top - LAYOUT_MARGIN;
@@ -262,7 +261,7 @@ export const PositronModalPopup = (props: PropsWithChildren<PositronModalPopupPr
 
 		// Set the popup layout.
 		setPopupLayout(popupLayout);
-	}, [props.anchorElement, props.anchorPoint, props.height, props.popupAlignment, props.popupPosition, props.width, props.yaba]);
+	}, [props.anchorElement, props.anchorPoint, props.height, props.popupAlignment, props.popupPosition, props.width, props.fixedHeight]);
 
 	// Layout.
 	useLayoutEffect(() => {
diff --git a/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx b/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
index f818353c9fa..6c4ee4ed419 100644
--- a/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
+++ b/src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/components/addEditRowFilterModalPopup/addEditRowFilterModalPopup.tsx
@@ -753,13 +753,13 @@ export const AddEditRowFilterModalPopup = (props: AddEditRowFilterModalPopupProp
 	return (
 		<PositronModalPopup
 			anchorElement={props.anchorElement}
+			fixedHeight={true}
 			height={'min-content'}
 			keyboardNavigationStyle='dialog'
 			popupAlignment='auto'
 			popupPosition='auto'
 			renderer={props.renderer}
 			width={275}
-			yaba={true}
 			onAccept={applyRowFilter}
 		>
 			<div className='add-edit-row-filter-modal-popup-body'>