diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in
index a1b5d5994..f1df14b99 100755
--- a/src/gnome-shell-perf-tool.in
+++ b/src/gnome-shell-perf-tool.in
@@ -320,7 +320,7 @@ if args:
 
 normal_exit = run_performance_test()
 if normal_exit:
-    if not options.hwtest:
+    if not options.hwtest and options.replace:
         restore_shell()
 else:
     sys.exit(1)