diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/_dashboard_grid.scss b/src/plugins/dashboard/public/dashboard_container/component/grid/_dashboard_grid.scss
index 450df53c0990a..940accfa4a545 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/_dashboard_grid.scss
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/_dashboard_grid.scss
@@ -54,10 +54,18 @@
   width: 100% !important; /* 1 */
   top: 0 !important; /* 1 */
   left: 0 !important; /* 1 */
+  padding: $euiSizeS;
 
   // Altered panel styles can be found in ../panel
 }
 
+// Remove padding in fullscreen mode
+.kbnAppWrapper--hiddenChrome {
+  .dshDashboardGrid__item--expanded {
+    padding: 0;
+  }
+}
+
 // REACT-GRID
 
 .react-grid-item {
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
index 56555b2406395..86ef728eebd34 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
@@ -68,14 +68,13 @@ function ResponsiveGrid({
   });
 
   const MARGINS = useMargins ? 8 : 0;
-  // We can't take advantage of isDraggable or isResizable due to performance concerns:
-  // https://github.com/STRML/react-grid-layout/issues/240
+
   return (
     <ReactGridLayout
       width={lastValidGridSize}
       className={classes}
-      isDraggable={true}
-      isResizable={true}
+      isDraggable={!maximizedPanelId}
+      isResizable={!maximizedPanelId}
       // There is a bug with d3 + firefox + elements using transforms.
       // See https://github.com/elastic/kibana/issues/16870 for more context.
       useCSSTransforms={false}
@@ -177,6 +176,7 @@ export const DashboardGrid = () => {
         },
         {} as { [key: string]: DashboardPanelState }
       );
+
       // onLayoutChange gets called by react grid layout a lot more than it should, so only dispatch the updated panels if the layout has actually changed
       if (!getPanelLayoutsAreEqual(panels, updatedPanels)) {
         dispatch(setPanels(updatedPanels));
diff --git a/src/plugins/dashboard/public/dashboard_container/component/panel/_dashboard_panel.scss b/src/plugins/dashboard/public/dashboard_container/component/panel/_dashboard_panel.scss
index f2d017e54dc7b..f04e5e29d960b 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/panel/_dashboard_panel.scss
+++ b/src/plugins/dashboard/public/dashboard_container/component/panel/_dashboard_panel.scss
@@ -5,10 +5,8 @@
   */
 
 // LAYOUT MODES
-
 // Adjust borders/etc... for non-spaced out and expanded panels
-.dshLayout-withoutMargins,
-.dshDashboardGrid__item--expanded {
+.dshLayout-withoutMargins {
   .embPanel {
     box-shadow: none;
     border-radius: 0;
@@ -21,4 +19,9 @@
   .embPanel {
     border-color: transparent;
   }
+
+  .embPanel--dragHandle:hover {
+    background-color: unset;
+    cursor: default;
+  }
 }
diff --git a/src/plugins/embeddable/public/lib/panel/_embeddable_panel.scss b/src/plugins/embeddable/public/lib/panel/_embeddable_panel.scss
index 80814427c9371..5656bb7566775 100644
--- a/src/plugins/embeddable/public/lib/panel/_embeddable_panel.scss
+++ b/src/plugins/embeddable/public/lib/panel/_embeddable_panel.scss
@@ -136,10 +136,10 @@
 // EDITING MODE
 
 .embPanel--editing {
-  border-style: dashed !important;
-  border-color: $euiColorMediumShade !important;
+  outline-style: dashed !important;
+  outline-color: $euiColorMediumShade !important;
   transition: all $euiAnimSpeedFast $euiAnimSlightResistance;
-  border-width: $euiBorderWidthThin;
+  outline-width: $euiBorderWidthThin;
 
   &:hover,
   &:focus {