diff --git a/ClassicalSharp/2D/Screens/ChatScreen.cs b/ClassicalSharp/2D/Screens/ChatScreen.cs
index 44f2125f2..1464f892d 100644
--- a/ClassicalSharp/2D/Screens/ChatScreen.cs
+++ b/ClassicalSharp/2D/Screens/ChatScreen.cs
@@ -208,6 +208,7 @@ namespace ClassicalSharp {
 			if( !game.Drawer2D.UseBitmappedChat ) return;
 			Dispose();
 			Init();
+			UpdateChatYOffset( true );
 		}
 		
 		public override void OnResize( int oldWidth, int oldHeight, int width, int height ) {
diff --git a/ClassicalSharp/Game/InputHandler.cs b/ClassicalSharp/Game/InputHandler.cs
index f11794f19..5ba335e80 100644
--- a/ClassicalSharp/Game/InputHandler.cs
+++ b/ClassicalSharp/Game/InputHandler.cs
@@ -362,7 +362,7 @@ namespace ClassicalSharp {
 		void CycleDistanceForwards() {
 			for( int i = 0; i < viewDistances.Length; i++ ) {
 				int dist = viewDistances[i];
-				if( dist > game.ViewDistance ) {
+				if( dist > game.UserViewDistance ) {
 					game.SetViewDistance( dist, true ); return;
 				}
 			}
@@ -372,7 +372,7 @@ namespace ClassicalSharp {
 		void CycleDistanceBackwards() {
 			for( int i = viewDistances.Length - 1; i >= 0; i-- ) {
 				int dist = viewDistances[i];
-				if( dist < game.ViewDistance ) {
+				if( dist < game.UserViewDistance ) {
 					game.SetViewDistance( dist, true ); return;
 				}
 			}