diff --git a/rust/perspective-viewer/src/rust/components/form/color_range_selector.rs b/rust/perspective-viewer/src/rust/components/form/color_range_selector.rs
index 7c49d94119..2184b4ce88 100644
--- a/rust/perspective-viewer/src/rust/components/form/color_range_selector.rs
+++ b/rust/perspective-viewer/src/rust/components/form/color_range_selector.rs
@@ -44,6 +44,22 @@ pub fn color_chooser_component(props: &ColorRangeProps) -> Html {
             false,
         )
     });
+
+    {
+        let gradient = gradient.clone();
+
+        use_effect_with(
+            (props.neg_color.clone(), props.pos_color.clone()),
+            move |(neg_color, pos_color)| {
+                let current_gradient = gradient.clone();
+                if &current_gradient.0 != pos_color || &current_gradient.1 != neg_color {
+                    gradient.set((pos_color.clone(), neg_color.clone(), true));
+                }
+                || ()
+            },
+        );
+    }
+
     let on_pos_color = use_callback(
         (gradient.clone(), props.on_pos_color.clone()),
         |event: InputEvent, (gradient, on_pos_color)| {
diff --git a/rust/perspective-viewer/src/rust/components/number_column_style.rs b/rust/perspective-viewer/src/rust/components/number_column_style.rs
index a72f88e206..bfddfa2078 100644
--- a/rust/perspective-viewer/src/rust/components/number_column_style.rs
+++ b/rust/perspective-viewer/src/rust/components/number_column_style.rs
@@ -203,7 +203,7 @@ impl Component for NumberColumnStyle {
                 }
 
                 self.dispatch_config(ctx);
-                false
+                true
             },
             NumberColumnStyleMsg::NegColorChanged(side, val) => {
                 if side == Fg {
@@ -215,7 +215,7 @@ impl Component for NumberColumnStyle {
                 }
 
                 self.dispatch_config(ctx);
-                false
+                true
             },
             NumberColumnStyleMsg::NumberForeModeChanged(val) => {
                 self.fg_mode = val;
diff --git a/rust/perspective-viewer/test/js/column_settings.spec.ts b/rust/perspective-viewer/test/js/column_settings.spec.ts
index 4c24bbc068..d453d0c13e 100644
--- a/rust/perspective-viewer/test/js/column_settings.spec.ts
+++ b/rust/perspective-viewer/test/js/column_settings.spec.ts
@@ -211,4 +211,81 @@ test.describe("Plugin Styles", () => {
         await view.columnSettingsSidebar.attributesTab.saveBtn.click();
         expect(await selectedTab()).toBe("Attributes");
     });
+
+    test("Color range component updates when switching columns to edit different number column without closing sidebar", async ({
+        page,
+    }) => {
+        const view = new PageView(page);
+        await view.restore({
+            plugin: "Datagrid",
+            columns: ["Row ID", "Postal Code"],
+            settings: true,
+        });
+
+        const defaultNegColor = "#ff471e";
+
+        let settingsPanel = await view.openSettingsPanel();
+
+        let activeColumns = settingsPanel.activeColumns;
+        let firstCol = await activeColumns.getColumnByName("Row ID");
+        let secondCol = await activeColumns.getColumnByName("Postal Code");
+
+        // edit first number column
+        await firstCol.editBtn.waitFor();
+        await firstCol.editBtn.click();
+        await checkTab(view.columnSettingsSidebar, true, false, false);
+
+        // expect style tab is selected
+        const selectedTab = async () => {
+            return await view.columnSettingsSidebar.selectedTab
+                .locator(".tab-title")
+                .getAttribute("id");
+        };
+        expect(await selectedTab()).toBe("Style");
+
+        // expect -ve color input on color range is present and has valid default value
+        const getFgColorNeg = async () => {
+            return view.columnSettingsSidebar.styleTab.container.locator(
+                "#fg-color-neg"
+            );
+        };
+        let fgColorNeg = await getFgColorNeg();
+
+        expect(fgColorNeg).toBeTruthy();
+        expect(fgColorNeg).toBeVisible();
+        expect(fgColorNeg).toBeEditable();
+        expect(fgColorNeg).toHaveValue(defaultNegColor);
+
+        // change -ve color from default
+        await fgColorNeg.fill("#ffff00");
+
+        let negColorValue = await fgColorNeg.inputValue();
+        expect(negColorValue).toBe("#ffff00");
+
+        // edit second number column
+        await secondCol.editBtn.waitFor();
+        await secondCol.editBtn.click();
+
+        // expect -ve color input on color range is present
+        fgColorNeg = await getFgColorNeg();
+
+        expect(fgColorNeg).toBeVisible();
+
+        // expect -ve color input updates and switches back to default
+        negColorValue = await fgColorNeg.inputValue();
+        expect(negColorValue).toBe(defaultNegColor);
+
+        // edit first number column
+        await firstCol.editBtn.waitFor();
+        await firstCol.editBtn.click();
+
+        // expect -ve color input on color range is present
+        fgColorNeg = await getFgColorNeg();
+
+        expect(fgColorNeg).toBeVisible();
+
+        // expect -ve color input updates and switches back to the changed value
+        negColorValue = await fgColorNeg.inputValue();
+        expect(negColorValue).toBe("#ffff00");
+    });
 });