diff --git a/common/gal/graphics_abstraction_layer.cpp b/common/gal/graphics_abstraction_layer.cpp
index a541972fd6..c66ae92307 100644
--- a/common/gal/graphics_abstraction_layer.cpp
+++ b/common/gal/graphics_abstraction_layer.cpp
@@ -249,6 +249,6 @@ VECTOR2D GAL::GetGridPoint( const VECTOR2D& aPoint ) const
                      round( ( aPoint.y - gridOffset.y ) / gridSize.y ) * gridSize.y + gridOffset.y );
 }
 
-const int GAL::MIN_DEPTH = -256;
-const int GAL::MAX_DEPTH = 255;
+const int GAL::MIN_DEPTH = -1024;
+const int GAL::MAX_DEPTH = 1023;
 const int GAL::GRID_DEPTH = MAX_DEPTH - 1;
diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index 2639d35323..48eb53c665 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -42,7 +42,7 @@ using namespace KIGFX;
 // Prototypes
 void InitTesselatorCallbacks( GLUtesselator* aTesselator );
 
-const int glAttributes[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 8, 0 };
+const int glAttributes[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 24, 0 };
 
 wxGLContext* OPENGL_GAL::glContext = NULL;
 
diff --git a/include/view/view.h b/include/view/view.h
index 76468cd863..f94e95924f 100644
--- a/include/view/view.h
+++ b/include/view/view.h
@@ -530,7 +530,7 @@ public:
 
     const BOX2I CalculateExtents() ;
 
-    static const int VIEW_MAX_LAYERS = 256;      ///< maximum number of layers that may be shown
+    static const int VIEW_MAX_LAYERS = 128;      ///< maximum number of layers that may be shown
 
 private:
     struct VIEW_LAYER