diff --git a/Riot/Modules/Application/AppDelegate.swift b/Riot/Modules/Application/AppDelegate.swift
index deef3aa91..14011b446 100644
--- a/Riot/Modules/Application/AppDelegate.swift
+++ b/Riot/Modules/Application/AppDelegate.swift
@@ -22,13 +22,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     // MARK: - Properties
     
-    var window: UIWindow?        
+    // MARK: Private
     
     private var legacyAppDelegate: LegacyAppDelegate {
         return AppDelegate.theDelegate()
     }
     
-    // MARK: - Public
+    // MARK: Public
     
     /// Call the Riot legacy AppDelegate
     @objc class func theDelegate() -> LegacyAppDelegate {
@@ -38,6 +38,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return legacyAppDelegate
     }
     
+    // UIApplicationDelegate properties
+    
+    /// Main application window
+    var window: UIWindow?
+    
     // MARK: - UIApplicationDelegate
     
     // MARK: Life cycle