diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
index f5ffb07180..a4067b9c28 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
@@ -1856,6 +1856,20 @@ public class ReferenceSetManager implements IReferenceSetManager,
      */
     @Override
     public void spatialEditorTimeChanged(Date date) {
-        evaluateActiveRefSet();
+        IPythonJobListener<ReferenceData> listener = new IPythonJobListener<ReferenceData>() {
+            @Override
+            public void jobFailed(Throwable e) {
+                statusHandler.handle(Priority.PROBLEM,
+                        "Unable to run QueryScript job", e);
+            }
+
+            @Override
+            public void jobFinished(ReferenceData result) {
+                if (!result.getGrid().equals(activeRefSet.getGrid())) {
+                    setActiveRefSet(result);
+                }
+            }
+        };
+        evaluateActiveRefSet(listener);
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
index fd5141c697..31fa36a1ce 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
@@ -859,7 +859,7 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
         IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
                 "evaluate", argMap);
 
-        IPythonJobListener<Object> listener = new IPythonJobListener<Object>() {
+        IPythonJobListener<ReferenceData> listener = new IPythonJobListener<ReferenceData>() {
             @Override
             public void jobFailed(Throwable e) {
                 statusHandler.handle(Priority.PROBLEM,
@@ -867,12 +867,16 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
             }
 
             @Override
-            public void jobFinished(Object result) {
-                ReferenceData newRef = (ReferenceData) result;
-                activeDisplay.setText(s);
-                refSetMgr.incomingRefSet(newRef, RefSetMode.USE_CURRENT);
-                addToHistory(s);
-                queryField.setText("");
+            public void jobFinished(final ReferenceData result) {
+                VizApp.runAsync(new Runnable() {
+                    public void run() {
+                        activeDisplay.setText(s);
+                        refSetMgr
+                                .incomingRefSet(result, RefSetMode.USE_CURRENT);
+                        addToHistory(s);
+                        queryField.setText("");
+                    };
+                });
             }
         };
         try {