diff --git a/common/mekanism/common/RobitAIFollow.java b/common/mekanism/common/RobitAIFollow.java
index e894860a5..0cec17862 100644
--- a/common/mekanism/common/RobitAIFollow.java
+++ b/common/mekanism/common/RobitAIFollow.java
@@ -61,6 +61,9 @@ public class RobitAIFollow extends EntityAIBase
         }
         else if(!theRobit.getFollowing())
         {
+        	//Still looks up at the player if on chargepad or not following
+        	
+        	theRobit.getLookHelper().setLookPositionWithEntity(player, 6.0F, theRobit.getVerticalFaceSpeed()/10);
             return false;
         }
         else if(theRobit.getDistanceSqToEntity(player) < (minDist * minDist))