diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index 2caa60bf..2dfa5246 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -1401,24 +1401,27 @@ void Game::mouseMove(int x, int y, const MouseState *ms) {
 			//if(Window::isKeyDown() == false)
 			if(!camLeftButtonDown && !camRightButtonDown && !camUpButtonDown && !camDownButtonDown)
 			{
-				if (y < 10) {
-					gameCamera.setMoveZ(-scrollSpeed);
-				}
-				else if (y > metrics.getVirtualH() - 10) {
-					gameCamera.setMoveZ(scrollSpeed);
-				}
-				else {
-					gameCamera.setMoveZ(0);
-				}
+				bool mouseMoveScrollsWorld = Config::getInstance().getBool("MouseMoveScrollsWorld","true");
+				if(mouseMoveScrollsWorld == true) {
+					if (y < 10) {
+						gameCamera.setMoveZ(-scrollSpeed);
+					}
+					else if (y > metrics.getVirtualH() - 10) {
+						gameCamera.setMoveZ(scrollSpeed);
+					}
+					else {
+						gameCamera.setMoveZ(0);
+					}
 
-				if (x < 10) {
-					gameCamera.setMoveX(-scrollSpeed);
-				}
-				else if (x > metrics.getVirtualW() - 10) {
-					gameCamera.setMoveX(scrollSpeed);
-				}
-				else {
-					gameCamera.setMoveX(0);
+					if (x < 10) {
+						gameCamera.setMoveX(-scrollSpeed);
+					}
+					else if (x > metrics.getVirtualW() - 10) {
+						gameCamera.setMoveX(scrollSpeed);
+					}
+					else {
+						gameCamera.setMoveX(0);
+					}
 				}
 			}