diff --git a/client/pages/ProgramPage.tsx b/client/pages/ProgramPage.tsx
index 168468b..4eba381 100644
--- a/client/pages/ProgramPage.tsx
+++ b/client/pages/ProgramPage.tsx
@@ -252,8 +252,8 @@ class ProgramPage extends React.Component<ProgramPageProps> {
 
   @action.bound
   private close() {
-    // this.props.history.goBack();
-    this.props.appState.history.goBack();
+    const { deviceId } = this.props.match.params;
+    this.props.history.push({ pathname: route.device(deviceId), search: "" });
   }
 
   @action.bound