diff --git a/packages/base/src/dialogs/symbology/vector_layer/types/Heatmap.tsx b/packages/base/src/dialogs/symbology/vector_layer/types/Heatmap.tsx
index ceb166dde..2d20f2507 100644
--- a/packages/base/src/dialogs/symbology/vector_layer/types/Heatmap.tsx
+++ b/packages/base/src/dialogs/symbology/vector_layer/types/Heatmap.tsx
@@ -86,7 +86,7 @@ const Heatmap = ({
 
   return (
     <div className="jp-gis-layer-symbology-container">
-      <div className="jp-gis-symbology-row">
+      <div className="jp-gis-symbology-row jp-gis-heatmap">
         <label htmlFor="color-ramp-select">Color Ramp:</label>
         <CanvasSelectComponent
           selectedRamp={selectedRamp}
diff --git a/packages/base/src/formbuilder/objectform/vectorlayerform.ts b/packages/base/src/formbuilder/objectform/vectorlayerform.ts
index e9cb51d7c..e812fbeab 100644
--- a/packages/base/src/formbuilder/objectform/vectorlayerform.ts
+++ b/packages/base/src/formbuilder/objectform/vectorlayerform.ts
@@ -29,7 +29,7 @@ export class VectorLayerPropertiesForm extends LayerPropertiesForm {
       });
     }
     props.model.clientStateChanged.connect(() => {
-      if (!props.model.localState?.selected.value) {
+      if (!props.model.localState?.selected?.value) {
         return;
       }
       const l = this.props.model.getLayer(
diff --git a/packages/base/src/mainview/mainView.tsx b/packages/base/src/mainview/mainView.tsx
index f03c8bddb..38b114482 100644
--- a/packages/base/src/mainview/mainView.tsx
+++ b/packages/base/src/mainview/mainView.tsx
@@ -263,10 +263,6 @@ export class MainView extends React.Component<IProps, IStates> {
       });
 
       this._Map.on('moveend', () => {
-        if (!this._initializedPosition) {
-          return;
-        }
-
         const currentOptions = this._model.getOptions();
 
         const view = this._Map.getView();
@@ -319,7 +315,6 @@ export class MainView extends React.Component<IProps, IStates> {
         );
         const options = this._model.getOptions();
         this.updateOptions(options);
-        this._initializedPosition = true;
       }
 
       this._Map.getViewport().addEventListener('contextmenu', event => {
@@ -1298,16 +1293,10 @@ export class MainView extends React.Component<IProps, IStates> {
     });
   };
 
-  private _onSharedOptionsChanged(
-    sender?: IJupyterGISDoc,
-    change?: MapChange
-  ): void {
-    if (!this._initializedPosition) {
+  private _onSharedOptionsChanged(): void {
+    if (!this.state.remoteUser) {
       const options = this._model.getOptions();
-
       this.updateOptions(options);
-
-      this._initializedPosition = true;
     }
   }
 
@@ -1766,7 +1755,6 @@ export class MainView extends React.Component<IProps, IStates> {
 
   private _clickCoords: Coordinate;
   private _commands: CommandRegistry;
-  private _initializedPosition = false;
   private divRef = React.createRef<HTMLDivElement>(); // Reference of render div
   private _Map: OlMap;
   private _model: IJupyterGISModel;
diff --git a/packages/base/style/symbologyDialog.css b/packages/base/style/symbologyDialog.css
index 1f2de9113..7d33e00a1 100644
--- a/packages/base/style/symbologyDialog.css
+++ b/packages/base/style/symbologyDialog.css
@@ -210,11 +210,8 @@ select option {
   border-radius: var(--jp-border-radius);
 }
 
-.jp-Dialog-content:has(.jp-gis-color-canvas-display) {
-  overflow: visible;
-}
-
-.jp-Dialog-body:has(.jp-gis-color-canvas-display) {
+.jp-Dialog-content:has(.jp-gis-heatmap),
+.jp-Dialog-body:has(.jp-gis-heatmap) {
   overflow: visible;
 }
 
diff --git a/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-0-linux.png b/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-0-linux.png
index 3da128996..be625c481 100644
Binary files a/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-0-linux.png and b/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-0-linux.png differ
diff --git a/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-3-linux.png b/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-3-linux.png
index 56cc71ccd..074b3626c 100644
Binary files a/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-3-linux.png and b/ui-tests/tests/notebook.spec.ts-snapshots/dark-Notebook-ipynb-cell-3-linux.png differ
diff --git a/ui-tests/tests/notebook.spec.ts-snapshots/light-Notebook-ipynb-cell-3-linux.png b/ui-tests/tests/notebook.spec.ts-snapshots/light-Notebook-ipynb-cell-3-linux.png
index 6b5857ac0..f54c1bb8d 100644
Binary files a/ui-tests/tests/notebook.spec.ts-snapshots/light-Notebook-ipynb-cell-3-linux.png and b/ui-tests/tests/notebook.spec.ts-snapshots/light-Notebook-ipynb-cell-3-linux.png differ