diff --git a/packages/geoview-core/src/core/components/geolocator/geolocator-result.tsx b/packages/geoview-core/src/core/components/geolocator/geolocator-result.tsx
index 545e3c107f3..116bf470198 100644
--- a/packages/geoview-core/src/core/components/geolocator/geolocator-result.tsx
+++ b/packages/geoview-core/src/core/components/geolocator/geolocator-result.tsx
@@ -198,7 +198,7 @@ export function GeolocatorResult({ geoLocationData, searchValue, error }: Geoloc
         </Box>
       )}
       <Divider />
-      <Box sx={{ maxHeight: mapSize![1] - 160, overflowY: 'auto' }}>
+      <Box sx={{ maxHeight: mapSize![1] - 240, overflowY: 'auto' }}>
         {!!data.length && <GeoList geoListItems={data} searchValue={searchValue} />}
         {(!data.length || error) && (
           <Box sx={{ p: 10 }}>
diff --git a/packages/geoview-core/src/ui/panel/panel.tsx b/packages/geoview-core/src/ui/panel/panel.tsx
index 95f527840fc..d9b379f8dcf 100644
--- a/packages/geoview-core/src/ui/panel/panel.tsx
+++ b/packages/geoview-core/src/ui/panel/panel.tsx
@@ -118,14 +118,10 @@ export function Panel(props: TypePanelAppProps): JSX.Element {
   useEffect(() => {
     const mapInfo = document.getElementById(`${mapId}-mapInfo`);
 
-    // Set a timeout for the duration of the CSS animation
-    setTimeout(() => {
-      // Animation completed, run additional logic here
-      if (panelContainerRef.current && open && mapInfo) {
-        const mapInfoHeight = mapInfo.getBoundingClientRect().height;
-        panelContainerRef.current.style.height = `calc(100%  - ${mapInfoHeight}px)`;
-      }
-    }, 500);
+    if (panelContainerRef.current && open && mapInfo) {
+      const mapInfoHeight = mapInfoExpanded ? '6rem' : '3rem';
+      panelContainerRef.current.style.height = `calc(100%  - ${mapInfoHeight})`;
+    }
   }, [mapInfoExpanded, mapSize, open, mapId]);
 
   return (