diff --git a/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java b/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/AbstractInteractableComponent.java
@@ -40,12 +40,12 @@ public abstract class AbstractInteractableComponent<T extends AbstractInteractab
     }
 
     @Override
-    public Interactable takeFocus() {
+    public T takeFocus() {
         BasePane basePane = getBasePane();
         if(basePane != null) {
             basePane.setFocusedInteractable(this);
         }
-        return this;
+        return self();
     }
 
     /**
Adjusting method so it turns the parameterized type instead of the general interface