--- a/testing/marionette/harness/marionette_harness/runner/mixins/window_manager.py
+++ b/testing/marionette/harness/marionette_harness/runner/mixins/window_manager.py
@@ -46,22 +46,21 @@ class WindowManagerMixin(object):
     def close_all_windows(self):
         current_chrome_window_handles = self.marionette.chrome_window_handles
 
         # If the start window is not present anymore, use the next one of the list
         if self.start_window not in current_chrome_window_handles:
             self.start_window = current_chrome_window_handles[0]
         current_chrome_window_handles.remove(self.start_window)
 
-        with self.marionette.using_context("chrome"):
-            for handle in current_chrome_window_handles:
-                self.marionette.switch_to_window(handle)
-                self.marionette.close_chrome_window()
+        for handle in current_chrome_window_handles:
+            self.marionette.switch_to_window(handle)
+            self.marionette.close_chrome_window()
 
-            self.marionette.switch_to_window(self.start_window)
+        self.marionette.switch_to_window(self.start_window)
 
     def open_tab(self, trigger="menu"):
         current_tabs = self.marionette.window_handles
 
         try:
             if callable(trigger):
                 trigger()
             elif trigger == 'menu':