diff --git a/.gitignore b/.gitignore
index 620d25825e089cc6822ba7b0997cede604c9b6e2..62c1fb08ed03dcbcb0c47e936d194750afcd469b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,6 +210,7 @@ build/gamesource/*
 /build/gamesource/shaders/cache/*
 !shaders/
 !gui/
+!editor_gui/
 docs/html/*
 !docs/html/material_editor/
 !docs/html/particles_editor/
diff --git a/source/gui/IRenderBorder.cpp b/source/gui/IRenderBorder.cpp
index 5ed841626848cb3755f793a5e2c51fdc260fee83..b9537f75c949f0880d626d28eb4c49753344e50a 100644
--- a/source/gui/IRenderBorder.cpp
+++ b/source/gui/IRenderBorder.cpp
@@ -17,11 +17,12 @@ namespace gui
 					m_iIndexStart[i] = 0;
 					m_iIndexCount[i] = 0;
 					//m_iColor[i] = 0xFF000000;
-					m_pColor[i] = float4_t(0.0f, 0.0f, 0.0f, 1.0f);
+					m_pColor[i] = float4_t(0.0f, 0.0f, 0.0f, 0.0f);
 					m_iVertexCount[i] = 0;
 					m_iVertexStart[i] = 0;
 					m_iSideCount[i] = 0;
 					m_pColorsConstant[i] = GetGUI()->getDevice()->createConstantBuffer(sizeof(float4));
+					m_pColorsConstant[i]->update(&m_pColor[i]);
 				}
 
 				m_pColorBlack = GetGUI()->getDevice()->createConstantBuffer(sizeof(float4));
diff --git a/source/xUI/XUI.cpp b/source/xUI/XUI.cpp
index 84905dbb0bf27c26d806be755d9ee796288817ca..4c4b4028195e51178ae5684ad57dc55dabc549fc 100644
--- a/source/xUI/XUI.cpp
+++ b/source/xUI/XUI.cpp
@@ -51,7 +51,10 @@ void XMETHODCALLTYPE CXUI::render()
 
 	for(UINT i = 0, l = m_pWindows.size(); i < l; ++i)
 	{
-		m_pWindows[i]->render(pCtx);
+		if(m_pWindows[i]->isVisible())
+		{
+			m_pWindows[i]->render(pCtx);
+		}
 	}
 
 	pCtx->setColorTarget(pOldSurface);
@@ -63,7 +66,10 @@ void XMETHODCALLTYPE CXUI::present()
 {
 	for(UINT i = 0, l = m_pWindows.size(); i < l; ++i)
 	{
-		m_pWindows[i]->present();
+		if(m_pWindows[i]->isVisible())
+		{
+			m_pWindows[i]->present();
+		}
 	}
 }