diff --git a/docs/en_US/release_notes_6_9.rst b/docs/en_US/release_notes_6_9.rst
index eb968e6ca..112d7ef63 100644
--- a/docs/en_US/release_notes_6_9.rst
+++ b/docs/en_US/release_notes_6_9.rst
@@ -24,6 +24,7 @@ Bug fixes
 *********
 
   | `Issue #6725 <https://redmine.postgresql.org/issues/6725>`_ -  Fixed an issue where the Query tool opens on minimum size if the user opens multiple query tool Window quickly.
+  | `Issue #7168 <https://redmine.postgresql.org/issues/7168>`_ -  Improvement to the Geometry Viewer popup to change the size of the result tables when column names are quite long.
   | `Issue #7187 <https://redmine.postgresql.org/issues/7187>`_ -  Fixed an issue where the downloaded ERD diagram was 0 bytes.
   | `Issue #7188 <https://redmine.postgresql.org/issues/7188>`_ -  Fixed an issue where the connection bar is not visible.
   | `Issue #7231 <https://redmine.postgresql.org/issues/7231>`_ -  Don't strip binaries when packaging them in the server RPM as this might break cpython modules.
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/GeometryViewer.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/GeometryViewer.jsx
index 845148d6a..755ba4662 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/GeometryViewer.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/GeometryViewer.jsx
@@ -24,7 +24,11 @@ const useStyles = makeStyles((theme)=>({
   mapContainer: {
     backgroundColor: theme.palette.background.default,
     height: '100%',
-    width: '100%'
+    width: '100%',
+    '& .leaflet-popup-content': {
+      overflow: 'auto',
+      margin: '8px',
+    }
   },
   table: {
     borderSpacing: 0,
@@ -38,7 +42,6 @@ const useStyles = makeStyles((theme)=>({
     ...theme.mixins.panelBorder.right,
     overflow: 'hidden',
     textOverflow: 'ellipsis',
-    whiteSpace: 'nowrap',
   },
   tableCellHead: {
     fontWeight: 'bold',