diff --git a/common/view/view.cpp b/common/view/view.cpp
index f0ffe34d65..eb361e3a7f 100644
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@@ -263,7 +263,7 @@ void VIEW::OnDestroy( VIEW_ITEM* aItem )
 VIEW::VIEW( bool aIsDynamic ) :
     m_enableOrderModifier( true ),
     m_scale( 4.0 ),
-    m_minScale( 0.2 ), m_maxScale( 5000.0 ),
+    m_minScale( 0.2 ), m_maxScale( 50000.0 ),
     m_mirrorX( false ), m_mirrorY( false ),
     m_painter( NULL ),
     m_gal( NULL ),
diff --git a/include/zoom_defines.h b/include/zoom_defines.h
index 11b8f108c7..411189b51b 100644
--- a/include/zoom_defines.h
+++ b/include/zoom_defines.h
@@ -55,9 +55,9 @@
 #define ZOOM_MIN_LIMIT_PLEDITOR 0.05
 
 // Scale limits for zoom for gerbview
-#define ZOOM_MAX_LIMIT_GERBVIEW 220
+#define ZOOM_MAX_LIMIT_GERBVIEW 5000
 #define ZOOM_MIN_LIMIT_GERBVIEW 0.02
 
 // Scale limits for zoom (especially mouse wheel) for Pcbnew
-#define ZOOM_MAX_LIMIT_PCBNEW 5000
-#define ZOOM_MIN_LIMIT_PCBNEW 0.1
\ No newline at end of file
+#define ZOOM_MAX_LIMIT_PCBNEW 50000
+#define ZOOM_MIN_LIMIT_PCBNEW 0.1