diff --git a/agent/Terminal.cc b/agent/Terminal.cc
index 5b8250e5..b0e766a1 100644
--- a/agent/Terminal.cc
+++ b/agent/Terminal.cc
@@ -214,7 +214,6 @@ void Terminal::moveTerminalToLine(int line)
             m_remoteLine++;
         }
     } else {
-        if (!m_consoleMode)
-            m_output->write("\r");
+        m_output->write("\r");
     }
 }
diff --git a/agent/winpty-agent.vcxproj b/agent/winpty-agent.vcxproj
index f2f14def..812a6783 100644
--- a/agent/winpty-agent.vcxproj
+++ b/agent/winpty-agent.vcxproj
@@ -75,6 +75,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -100,6 +101,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">