diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index a1f3fca13..d302dce06 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1942,7 +1942,7 @@ void GameView::OnDraw()
 			{
 				string message = (*iter);
 				startY -= 13;
-				g->fillrect(startX-3, startY-3, Graphics::textwidth((char*)message.c_str())+6																																		, 14, 0, 0, 0, 100);
+				g->fillrect(startX-3, startY-3, Graphics::textwidth((char*)message.c_str())+6, 14, 0, 0, 0, 100);
 				g->drawtext(startX, startY, message.c_str(), 255, 255, 255, startAlpha);
 				startAlpha-=14;
 			}
diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp
index 4b9c5d951..95de0e8e2 100644
--- a/src/interface/Button.cpp
+++ b/src/interface/Button.cpp
@@ -176,6 +176,8 @@ void Button::OnMouseUnclick(int x, int y, unsigned int button)
 
 void Button::OnMouseClick(int x, int y, unsigned int button)
 {
+	if(!Enabled)
+		return;
     if(button == 1)
     {
 		if(isTogglable)