diff --git a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java
index daf399ae683..5ef92e59dee 100644
--- a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java
+++ b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java
@@ -112,7 +112,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
             {
                 ActionButton button = new ActionButton(PipelineController.BrowseAction.class, "Process and Import Data");
                 button.setActionType(ActionButton.Action.LINK);
-                button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), getViewContext().getActionURL()));
+                button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl));
                 bar.add(button);
             }
         }
@@ -144,7 +144,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
             {
                 ActionButton button = new ActionButton(PipelineController.SetupAction.class, "Setup");
                 button.setActionType(ActionButton.Action.LINK);
-                button.setURL(PipelineController.urlSetup(getContainer(), getViewContext().getActionURL()));
+                button.setURL(PipelineController.urlSetup(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl));
                 bar.add(button);
             }
         }