diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Camera.java b/SPD-classes/src/main/java/com/watabou/noosa/Camera.java
index 012ac8072..0c7cfc120 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Camera.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Camera.java
@@ -173,7 +173,7 @@ public class Camera extends Gizmo {
 			panMove.x = panTarget.x - (scroll.x + width/2f);
 			panMove.y = panTarget.y - (scroll.y + height/2f);
 			
-			panMove.scale(Game.elapsed * panIntensity);
+			panMove.scale(Math.min(1f, Game.elapsed * panIntensity));
 			
 			scroll.offset(panMove);
 		}