diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index 65923c858..45e7ec681 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -133,6 +133,7 @@ void EditorComponent::ChangeRenderPath(RENDERPATH path)
 
 	renderPath->Initialize();
 	renderPath->Load();
+	renderPath->Update(0);
 
 	materialWnd.reset(new MaterialWindow(&GetGUI()));
 	postprocessWnd.reset(new PostprocessWindow(&GetGUI(), renderPath));
diff --git a/WickedEngine/RenderPath3D.cpp b/WickedEngine/RenderPath3D.cpp
index 8f373ae15..4eecde444 100644
--- a/WickedEngine/RenderPath3D.cpp
+++ b/WickedEngine/RenderPath3D.cpp
@@ -11,8 +11,6 @@ using namespace wiGraphics;
 
 void RenderPath3D::ResizeBuffers()
 {
-	RenderPath2D::ResizeBuffers();
-
 	GraphicsDevice* device = wiRenderer::GetDevice();
 
 	FORMAT defaultTextureFormat = device->GetBackBufferFormat();
@@ -289,6 +287,8 @@ void RenderPath3D::ResizeBuffers()
 
 		device->CreateRenderPass(&desc, &renderpass_waterripples);
 	}
+
+	RenderPath2D::ResizeBuffers();
 }
 
 void RenderPath3D::Update(float dt)