diff --git a/src/Zoomba/DesktopLibrary.py b/src/Zoomba/DesktopLibrary.py
index 8194335a..7bcb2868 100644
--- a/src/Zoomba/DesktopLibrary.py
+++ b/src/Zoomba/DesktopLibrary.py
@@ -223,7 +223,7 @@ def switch_application_by_name(self, remote_url, window_name, alias=None, timeou
         """
         desired_caps = kwargs
         desktop_session = self._open_desktop_session(remote_url)
-        window_xpath = '//*[contains(@Name, "' + window_name + '")]'
+        window_xpath = '//Window[contains(@Name, "' + window_name + '")]'
         try:
             if exact_match:
                 window = desktop_session.find_element_by_name(window_name)