diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
index 2bcdc5b9cd..0015000162 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardWrapper.tsx
@@ -47,6 +47,12 @@ const StyledDiv = styled.div`
       & .grid-row:after {
         border-style: hidden;
       }
+      & .droptarget-side:last-child {
+        inset-inline-end: 0;
+      }
+      & .droptarget-edge:last-child {
+        inset-block-end: 0;
+      }
     }
 
     /* A row within a column has inset hover menu */
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
index 216e9e8e82..98f2b84e8d 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
@@ -98,9 +98,6 @@ const ColumnStyles = styled.div`
         &:first-child {
           inset-block-start: 0;
         }
-        &:last-child {
-          inset-block-end: 0;
-        }
       }
       &:first-child:not(.droptarget-edge) {
         position: absolute;
@@ -295,7 +292,7 @@ class Column extends React.PureComponent {
                           className={cx(
                             'empty-droptarget',
                             itemIndex === columnItems.length - 1 &&
-                              'droptarget-edge-last',
+                              'droptarget-edge',
                           )}
                           editMode
                         >
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index 2f7a5e541b..bad32d4cdc 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -107,9 +107,6 @@ const GridRow = styled.div`
         &:first-child {
           inset-inline-start: 0;
         }
-        &:last-child {
-          inset-inline-end: 0;
-        }
       }
     }