diff --git a/src/Agent.Listener/SelfUpdater.cs b/src/Agent.Listener/SelfUpdater.cs
index 8f700547ca..b878d5b72e 100644
--- a/src/Agent.Listener/SelfUpdater.cs
+++ b/src/Agent.Listener/SelfUpdater.cs
@@ -270,6 +270,7 @@ private string GenerateBatchScript(string latestAgent, bool restartInteractiveAg
                 scriptBuilder.AppendLine("endlocal");
             }
 
+            scriptBuilder.AppendLine("echo Exit _update.cmd >> %logfile% 2>&1");
             scriptBuilder.AppendLine(":end");
 
             string updateScript = Path.Combine(IOUtil.GetWorkPath(HostContext), "_update.cmd");
@@ -363,9 +364,11 @@ private string GenerateShellScript(string latestAgent, bool restartInteractiveAg
             if (restartInteractiveAgent)
             {
                 scriptBuilder.AppendLine("echo \"Restarting interactive agent\"  >> \"$logfile\" 2>&1");
-                scriptBuilder.AppendLine("\"$existingagentbinfolder\"/$agentprocessname");
+                scriptBuilder.AppendLine("\"$existingagentbinfolder\"/$agentprocessname &");
             }
 
+            scriptBuilder.AppendLine("echo \"Exit _update.sh\" >> \"$logfile\" 2>&1");
+
             string updateScript = Path.Combine(IOUtil.GetWorkPath(HostContext), "_update.sh");
             if (File.Exists(updateScript))
             {