diff --git a/HPL2/resource/gui.frag.fsl b/HPL2/resource/gui.frag.fsl
index a72b0eca0..671a3d3a9 100644
--- a/HPL2/resource/gui.frag.fsl
+++ b/HPL2/resource/gui.frag.fsl
@@ -17,14 +17,14 @@ float4 PS_MAIN(PsIn In)
     INIT_MAIN;
     if(HasClipPlanes(Get(textureConfig)))
     {
-	for(int i = 0; i < 4; i++)
-	{
-	    float d = dot(Get(clipPlane)[i], float4(In.pos, 1.0));
-	    if(d < 0.0)
+	    for(int i = 0; i < 4; i++)
 	    {
-		discard;
+	        float d = dot(Get(clipPlane)[i], float4(In.pos, 1.0));
+	        if(d < 0.0)
+	        {
+		        discard;
+	        }
 	    }
-	}
     }
 
     float4 color = In.Color;      // Get the input color.
diff --git a/HPL2/sources/gui/GuiSet.cpp b/HPL2/sources/gui/GuiSet.cpp
index 5ffda6a41..c301b3ec2 100644
--- a/HPL2/sources/gui/GuiSet.cpp
+++ b/HPL2/sources/gui/GuiSet.cpp
@@ -134,9 +134,9 @@ namespace hpl {
                 samplerDesc.mMipLodBias = 0.f;
                 samplerDesc.mMaxAnisotropy = 16.f;
                 samplerDesc.mMipMapMode = MIPMAP_MODE_LINEAR;
-                samplerDesc.mAddressU = ADDRESS_MODE_CLAMP_TO_BORDER;
-                samplerDesc.mAddressV = ADDRESS_MODE_CLAMP_TO_BORDER;
-                samplerDesc.mAddressW = ADDRESS_MODE_CLAMP_TO_BORDER;
+                samplerDesc.mAddressU = ADDRESS_MODE_CLAMP_TO_EDGE;
+                samplerDesc.mAddressV = ADDRESS_MODE_CLAMP_TO_EDGE;
+                samplerDesc.mAddressW = ADDRESS_MODE_CLAMP_TO_EDGE;
                 addSampler(pipeline.Rend(), &samplerDesc, &GuiSampler);
             }
  			{