diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index 12904f117..41dc24834 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -1633,12 +1633,12 @@ void GameView::DoMouseMove(int x, int y, int dx, int dy)
 			int mouseX = x;
 			if(mouseX > XRES)
 				mouseX = XRES;
-			if (mouseX < 15)
-				mouseX = 15;
+			//if (mouseX < 15) //makes scrolling a little nicer at edges but apparently if you put hundreds of elements in a menu it makes the end not show ...
+			//	mouseX = 15;
 
 			scrollBar->Position.X = (int)(((float)mouseX/((float)XRES))*(float)(XRES-scrollSize));
 
-			float overflow = totalWidth-(XRES-BARSIZE), mouseLocation = float(XRES)/float(mouseX-(XRES));
+			float overflow = totalWidth-(XRES-BARSIZE), mouseLocation = float(XRES-3)/float(mouseX-(XRES-2)); //mouseLocation adjusted slightly in case you have 200 elements in one menu
 			setToolButtonOffset(overflow/mouseLocation);
 
 			//Ensure that mouseLeave events are make their way to the buttons should they move from underneath the mouse pointer
diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp
index c961ffa94..1cd619b7c 100644
--- a/src/gui/preview/PreviewView.cpp
+++ b/src/gui/preview/PreviewView.cpp
@@ -384,7 +384,7 @@ void PreviewView::OnMouseWheel(int x, int y, int d)
 
 void PreviewView::OnMouseUp(int x, int y, unsigned int button)
 {
-	//if mouse is on the scrollwheel or farther right, and you are at the top of bottom of a page, change pages
+	//if mouse is on the scrollbar or farther right, and you are at the top of bottom of a page, change pages
 	if (x > Position.X+commentsPanel->Position.X+commentsPanel->Size.X-6)
 	{
 		if (commentsPanel->GetScrollLimit() == 1)