diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
index 1fdbdb0..f45f5f0 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
@@ -32,7 +32,7 @@ public class Button extends Component {
 		this.font = font;
 		this.text = text;
 		setPreferredSize(107,34);
-		//super.addListener(onClickClass, onClick);
+        Button inButton = (Button) setFocusable(true);
 		
         addListener(new Object() {
             @Subscribe
@@ -44,12 +44,11 @@ public class Button extends Component {
         addListener(new Object() {
             @Subscribe
             public void onFocusChanged(FocusEvent e) {
+            	inButton.setText(e.getNewState() ? "Is Focused" : "Isn't focused");
                 requestReassembly();
             }
         });
         
-        Button inButton = this;
-        
         addListener((Class<KeyEvent>) KeyEvent.class, (InputListener<KeyEvent>) e -> {isClicked = e.isPress();
         							if (!inButton.isDisabled())
         								onClick.accept(inButton);
@@ -65,6 +64,7 @@ public class Button extends Component {
 	public void setDisable(boolean isDisabled)
 	{
 		this.isDisabled = isDisabled;
+        setFocusable(isDisabled);
 	}
 	
 	public boolean isDisabled()