diff --git a/atom.gyp b/atom.gyp
index 685ea7585..1e0656342 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -79,8 +79,6 @@
       'browser/atom_browser_main_parts.cc',
       'browser/atom_browser_main_parts.h',
       'browser/atom_browser_main_parts_mac.mm',
-      'browser/atom_event_processing_window.h',
-      'browser/atom_event_processing_window.mm',
       'browser/atom_javascript_dialog_manager.cc',
       'browser/atom_javascript_dialog_manager.h',
       'browser/browser.cc',
@@ -110,6 +108,8 @@
       'browser/ui/accelerator_util.h',
       'browser/ui/accelerator_util_mac.mm',
       'browser/ui/accelerator_util_win.cc',
+      'browser/ui/atom_event_processing_window.h',
+      'browser/ui/atom_event_processing_window.mm',
       'browser/ui/atom_menu_controller_mac.h',
       'browser/ui/atom_menu_controller_mac.mm',
       'browser/ui/file_dialog.h',
diff --git a/browser/native_window_mac.mm b/browser/native_window_mac.mm
index 3ef1d1b1c..65ff9e7d8 100644
--- a/browser/native_window_mac.mm
+++ b/browser/native_window_mac.mm
@@ -13,7 +13,7 @@
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
-#import "browser/atom_event_processing_window.h"
+#import "browser/ui/atom_event_processing_window.h"
 #include "brightray/browser/inspectable_web_contents.h"
 #include "brightray/browser/inspectable_web_contents_view.h"
 #include "common/draggable_region.h"
diff --git a/browser/atom_event_processing_window.h b/browser/ui/atom_event_processing_window.h
similarity index 84%
rename from browser/atom_event_processing_window.h
rename to browser/ui/atom_event_processing_window.h
index cb13025f3..e657e1aa0 100644
--- a/browser/atom_event_processing_window.h
+++ b/browser/ui/atom_event_processing_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_EVENT_PROCESSING_WINDOW_H_
-#define ATOM_BROWSER_ATOM_EVENT_PROCESSING_WINDOW_H_
+#ifndef ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
+#define ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -29,4 +29,4 @@
 - (BOOL)performKeyEquivalent:(NSEvent*)theEvent;
 @end
 
-#endif  // ATOM_BROWSER_ATOM_EVENT_PROCESSING_WINDOW_H_
+#endif  // ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
diff --git a/browser/atom_event_processing_window.mm b/browser/ui/atom_event_processing_window.mm
similarity index 98%
rename from browser/atom_event_processing_window.mm
rename to browser/ui/atom_event_processing_window.mm
index d209b0a0d..ec287fbba 100644
--- a/browser/atom_event_processing_window.mm
+++ b/browser/ui/atom_event_processing_window.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/atom_event_processing_window.h"
+#import "browser/ui/atom_event_processing_window.h"
 
 #include "base/logging.h"
 #import "content/public/browser/render_widget_host_view_mac_base.h"