diff --git a/source/player/player.cpp b/source/player/player.cpp
index 6f9515926..ff62b9493 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -507,21 +507,25 @@ pos=Pos;
 	{
 		ppos.vx+=m_cameraPos.vx*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
 		m_cameraPos.vx=0;
+		m_cameraScrollDir=0;
 	}
 	else if(m_cameraPos.vx>m_mapCameraEdges.vx)
 	{
 		ppos.vx-=(m_mapCameraEdges.vx-m_cameraPos.vx)*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
 		m_cameraPos.vx=m_mapCameraEdges.vx;
+		m_cameraScrollDir=0;
 	}
 	if(m_cameraPos.vy<0)
 	{
 		ppos.vy+=m_cameraPos.vy*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
 		m_cameraPos.vy=0;
+		m_cameraScrollDir=0;
 	}
 	else if(m_cameraPos.vy>m_mapCameraEdges.vy)
 	{
 		ppos.vy-=(m_mapCameraEdges.vy-m_cameraPos.vy)*MAP3D_BLOCKSTEPSIZE/MAP2D_BLOCKSTEPSIZE;
 		m_cameraPos.vy=m_mapCameraEdges.vy;
+		m_cameraScrollDir=0;
 	}
 }