diff --git a/include/NazaraEditor/Editor/UI/AssetsWindow.hpp b/include/NazaraEditor/Editor/UI/AssetsWindow.hpp
index 78f14c8..5f72fa3 100644
--- a/include/NazaraEditor/Editor/UI/AssetsWindow.hpp
+++ b/include/NazaraEditor/Editor/UI/AssetsWindow.hpp
@@ -6,7 +6,7 @@ namespace Nz
 		: public Nz::EditorWindow
 	{
 	public:
-		EditorAssetsWindow();
+		EditorAssetsWindow(EditorBaseApplication* app);
 
 		void ImportAsset();
 
diff --git a/include/NazaraEditor/Editor/UI/InspectorWindow.hpp b/include/NazaraEditor/Editor/UI/InspectorWindow.hpp
index ff6e278..3b1a2b9 100644
--- a/include/NazaraEditor/Editor/UI/InspectorWindow.hpp
+++ b/include/NazaraEditor/Editor/UI/InspectorWindow.hpp
@@ -8,7 +8,7 @@ namespace Nz
 		: public Nz::EditorWindow
 	{
 	public:
-		EditorInspectorWindow();
+		EditorInspectorWindow(EditorBaseApplication* app);
 
 		virtual void OnEditorGUI() override;
 
diff --git a/include/NazaraEditor/Editor/UI/LevelWindow.hpp b/include/NazaraEditor/Editor/UI/LevelWindow.hpp
index 4a1c20f..b117338 100644
--- a/include/NazaraEditor/Editor/UI/LevelWindow.hpp
+++ b/include/NazaraEditor/Editor/UI/LevelWindow.hpp
@@ -9,7 +9,7 @@ namespace Nz
 		: public Nz::EditorWindow
 	{
 	public:
-		EditorLevelWindow();
+		EditorLevelWindow(EditorBaseApplication* app);
 
 		virtual void OnEditorGUI() override;
 
diff --git a/include/NazaraEditor/Editor/UI/MainWindow.hpp b/include/NazaraEditor/Editor/UI/MainWindow.hpp
index 4b185a4..4a8f658 100644
--- a/include/NazaraEditor/Editor/UI/MainWindow.hpp
+++ b/include/NazaraEditor/Editor/UI/MainWindow.hpp
@@ -6,7 +6,7 @@ namespace Nz
 		: public Nz::EditorWindow
 	{
 	public:
-		EditorMainWindow();
+		EditorMainWindow(EditorBaseApplication* app);
 
 		bool Quit();
 
diff --git a/src/NazaraEditor/Editor/UI/AssetsWindow.cpp b/src/NazaraEditor/Editor/UI/AssetsWindow.cpp
index 71ff874..083b81b 100644
--- a/src/NazaraEditor/Editor/UI/AssetsWindow.cpp
+++ b/src/NazaraEditor/Editor/UI/AssetsWindow.cpp
@@ -2,8 +2,8 @@
 
 namespace Nz
 {
-	EditorAssetsWindow::EditorAssetsWindow()
-		: Nz::EditorWindow("Assets Browser")
+	EditorAssetsWindow::EditorAssetsWindow(EditorBaseApplication* app)
+		: Nz::EditorWindow(app, "Assets Browser")
 	{
 		BuildMenuBar();
 	}
diff --git a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp
index af43194..239fa56 100644
--- a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp
+++ b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp
@@ -4,10 +4,10 @@
 
 namespace Nz
 {
-	EditorInspectorWindow::EditorInspectorWindow()
-		: Nz::EditorWindow("Inspector")
+	EditorInspectorWindow::EditorInspectorWindow(EditorBaseApplication* app)
+		: Nz::EditorWindow(app, "Inspector")
 	{
-		EditorApplication::Instance().OnEntitySelected.Connect(this, &EditorInspectorWindow::OnEntitySelected);
+		app->OnEntitySelected.Connect(this, &EditorInspectorWindow::OnEntitySelected);
 	}
 
 	void EditorInspectorWindow::OnEditorGUI()
diff --git a/src/NazaraEditor/Editor/UI/LevelWindow.cpp b/src/NazaraEditor/Editor/UI/LevelWindow.cpp
index 428b0b9..fcb1701 100644
--- a/src/NazaraEditor/Editor/UI/LevelWindow.cpp
+++ b/src/NazaraEditor/Editor/UI/LevelWindow.cpp
@@ -4,15 +4,15 @@
 
 namespace Nz
 {
-	EditorLevelWindow::EditorLevelWindow()
-		: Nz::EditorWindow("Level")
-		, m_currentWorld(EditorApplication::Instance().GetCurrentWorld())
+	EditorLevelWindow::EditorLevelWindow(EditorBaseApplication* app)
+		: Nz::EditorWindow(app, "Level")
+		, m_currentWorld(app->GetCurrentWorld())
 		, m_dirty(true)
 	{
-		EditorApplication::Instance().OnWorldChanged.Connect([this](Nz::EnttWorld* world) { m_currentWorld = world; m_dirty = true; });
-		EditorApplication::Instance().OnEntityCreated.Connect([this](entt::handle) { m_dirty = true; });
-		EditorApplication::Instance().OnEntityDestroyed.Connect([this](entt::handle) { m_dirty = true; });
-		EditorApplication::Instance().OnEntityParentChanged.Connect([this](entt::handle) { m_dirty = true; });
+		app->OnWorldChanged.Connect([this](Nz::EnttWorld* world) { m_currentWorld = world; m_dirty = true; });
+		app->OnEntityCreated.Connect([this](entt::handle) { m_dirty = true; });
+		app->OnEntityDestroyed.Connect([this](entt::handle) { m_dirty = true; });
+		app->OnEntityParentChanged.Connect([this](entt::handle) { m_dirty = true; });
 	}
 
 	void EditorLevelWindow::OnEditorGUI()
diff --git a/src/NazaraEditor/Editor/UI/MainWindow.cpp b/src/NazaraEditor/Editor/UI/MainWindow.cpp
index 03269e8..5d68056 100644
--- a/src/NazaraEditor/Editor/UI/MainWindow.cpp
+++ b/src/NazaraEditor/Editor/UI/MainWindow.cpp
@@ -2,8 +2,8 @@
 
 namespace Nz
 {
-	EditorMainWindow::EditorMainWindow()
-		: Nz::EditorWindow("MainWindow")
+	EditorMainWindow::EditorMainWindow(EditorBaseApplication* app)
+		: Nz::EditorWindow(app, "MainWindow")
 	{
 		BuildMenuBar();
 	}
@@ -20,11 +20,6 @@ namespace Nz
 		AddMenuAction("File|Quit", "Ctrl+W", [this]() { Quit(); });
 	}
 
-	void EditorMainWindow::OnEditorGUI()
-	{
-
-	}
-
 	bool EditorMainWindow::Quit()
 	{
 		return true;