diff --git a/artiq/gui/entries.py b/artiq/gui/entries.py
index 9571e34af..0e1190b97 100644
--- a/artiq/gui/entries.py
+++ b/artiq/gui/entries.py
@@ -185,18 +185,24 @@ class _RangeScan(LayoutWidget):
         def update_start(value):
             state["start"] = value*scale
             scanner.setStart(value)
+            if start.value() != value:
+                start.setValue(value)
 
         def update_stop(value):
             state["stop"] = value*scale
             scanner.setStop(value)
+            if stop.value() != value:
+                stop.setValue(value)
 
         def update_npoints(value):
             state["npoints"] = value
             scanner.setNum(value)
+            if npoints.value() != value:
+                npoints.setValue(value)
 
-        scanner.startChanged.connect(start.setValue)
-        scanner.numChanged.connect(npoints.setValue)
-        scanner.stopChanged.connect(stop.setValue)
+        scanner.startChanged.connect(update_start)
+        scanner.numChanged.connect(update_npoints)
+        scanner.stopChanged.connect(update_stop)
         start.valueChanged.connect(update_start)
         npoints.valueChanged.connect(update_npoints)
         stop.valueChanged.connect(update_stop)