diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
index b80dfd0eb655d..08ac310f63447 100644
--- a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
+++ b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -1343,17 +1343,10 @@ public WebDriver window(String windowHandleOrName) {
 
     @Override
     public WebDriver newWindow(WindowType typeHint) {
-      String original = getWindowHandle();
-      try {
-        Response response = execute(DriverCommand.SWITCH_TO_NEW_WINDOW(typeHint));
-        String newWindowHandle =
-            ((Map<String, Object>) response.getValue()).get("handle").toString();
-        switchTo().window(newWindowHandle);
-        return RemoteWebDriver.this;
-      } catch (WebDriverException ex) {
-        switchTo().window(original);
-        throw ex;
-      }
+      Response response = execute(DriverCommand.SWITCH_TO_NEW_WINDOW(typeHint));
+      String newWindowHandle = ((Map<String, Object>) response.getValue()).get("handle").toString();
+      switchTo().window(newWindowHandle);
+      return RemoteWebDriver.this;
     }
 
     @Override
diff --git a/java/test/org/openqa/selenium/remote/RemoteWebDriverUnitTest.java b/java/test/org/openqa/selenium/remote/RemoteWebDriverUnitTest.java
index 2b76b70b8dfe5..7b845796a1e7a 100644
--- a/java/test/org/openqa/selenium/remote/RemoteWebDriverUnitTest.java
+++ b/java/test/org/openqa/selenium/remote/RemoteWebDriverUnitTest.java
@@ -320,7 +320,6 @@ void canHandleSwitchToNewWindowCommand() {
 
     assertThat(driver2).isSameAs(fixture.driver);
     fixture.verifyCommands(
-        new CommandPayload(DriverCommand.GET_CURRENT_WINDOW_HANDLE, emptyMap()),
         new CommandPayload(DriverCommand.SWITCH_TO_NEW_WINDOW, Map.of("type", "tab")),
         new CommandPayload(DriverCommand.SWITCH_TO_WINDOW, Map.of("handle", "new window")));
   }