diff --git a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Input.cs b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Input.cs
index 4fabf643c..f2fc14f38 100644
--- a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Input.cs
+++ b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Input.cs
@@ -38,7 +38,7 @@ namespace ClassicalSharp.Gui {
 		public override bool HandlesMouseClick( int mouseX, int mouseY, MouseButton button ) {
 			if( draggingMouse || game.hudScreen.hotbar.HandlesMouseClick( mouseX, mouseY, button ) )
 				return true;
-			if( button == MouseButton.Left && mouseX >= TableX && mouseX < TableX + scrollbarWidth ) {
+			if( button == MouseButton.Left && mouseX >= TableX - scrollbarWidth && mouseX < TableX ) {
 				ScrollbarClick( mouseY );
 			} else if( button == MouseButton.Left ) {
 				if( selIndex != -1 )
diff --git a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Scrolling.cs b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Scrolling.cs
index 004bc53fc..043de9ae8 100644
--- a/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Scrolling.cs
+++ b/ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Scrolling.cs
@@ -27,8 +27,8 @@ namespace ClassicalSharp.Gui {
 		}
 		
 		public override bool HandlesMouseScroll( int delta ) {
-			bool bounds = Contains( TableX, TableY, TableWidth, TableHeight,
-			                       game.Mouse.X, game.Mouse.Y );
+			bool bounds = Contains( TableX - scrollbarWidth, TableY, TableWidth + scrollbarWidth, 
+			                       TableHeight, game.Mouse.X, game.Mouse.Y );
 			bool hotbar = game.IsKeyDown( Key.AltLeft ) || game.IsKeyDown( Key.AltRight );
 			if( !bounds || hotbar ) return false;
 			
diff --git a/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
index 4bb581a94..7d13b58f0 100644
--- a/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
@@ -15,7 +15,7 @@ namespace ClassicalSharp.Gui {
 				// Column 1
 				MakeBool( -1, -150, "Black text shadows", OptionsKey.BlackTextShadows,
 				     OnWidgetClick, g => g.Drawer2D.BlackTextShadows,
-				     (g, v) => { g.Drawer2D.BlackTextShadows =v; HandleFontChange(); } ),		
+				     (g, v) => { g.Drawer2D.BlackTextShadows = v; HandleFontChange(); } ),		
 				
 				MakeBool( -1, -100, "Show FPS", OptionsKey.ShowFPS,
 				         OnWidgetClick, g => g.ShowFPS, (g, v) => g.ShowFPS = v ),