diff --git a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
index 7fee537..e3cdcbb 100644
--- a/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
+++ b/ProjectCruiser/ProjectCruiser/Drawings/DrawningCruiser.cs
@@ -133,13 +133,13 @@ public class DrawningCruiser
                 }
                 return true;
             case DirectionType.Right:
-                if (_startPosX.Value - EntityCruiser.Step > 0)
+                if (_startPosX.Value + _drawningCruiserWidth + EntityCruiser.Step < _pictureWidth)
                 {
                     _startPosX += (int)EntityCruiser.Step;
                 }
                 return true;
             case DirectionType.Down:
-                if (_startPosY.Value - EntityCruiser.Step > 0)
+                if (_startPosY.Value + _drawingCruiserHeight + EntityCruiser.Step < _pictureHeight)
                 {
                     _startPosY += (int)EntityCruiser.Step;
                 }