diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
index 4b5c11cc3..4dd6ed1ed 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
@@ -33,6 +33,7 @@ import javafx.application.Platform
 import javafx.fxml.FXML
 import javafx.scene.control.Label
 import javafx.scene.image.ImageView
+import javafx.scene.layout.GridPane
 import javafx.scene.layout.Pane
 import javafx.stage.WindowEvent
 import org.kordamp.ikonli.javafx.FontIcon
@@ -49,6 +50,8 @@ class MainErosController : JavaFXWindowController() {
     @FXML private lateinit var exitIconFX: FontIcon
 
     @FXML private lateinit var contentFX: Pane
+
+    @FXML private lateinit var accountFX: GridPane
     @FXML private lateinit var accountImageFX: ImageView
     @FXML private lateinit var accountNameFX: Label
 
@@ -121,8 +124,7 @@ class MainErosController : JavaFXWindowController() {
             accountImageFX.image = it?.avatar
             accountNameFX.ctext = it?.username ?: NO_ACCOUNT_SELECTED
         }
-        accountImageFX.clickable()
-        accountNameFX.clickable()
+        accountFX.clickable()
 
         activity = ErosMainActivities.PLAY
     }
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXUtil.kt b/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXUtil.kt
index 94248121d..ec9530c5e 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXUtil.kt
@@ -152,6 +152,7 @@ object JavaFXUtil {
     }
 
     fun Node.clickable() {
+        this.styleClass.add("button")
         this.cursorProperty().unsafeCast<StyleableProperty<Cursor>>().applyStyle(null, Cursor.HAND)
     }
 
diff --git a/src/main/resources/assets/minosoft/eros/main/main.fxml b/src/main/resources/assets/minosoft/eros/main/main.fxml
index ba7419a5f..4db25d5f1 100644
--- a/src/main/resources/assets/minosoft/eros/main/main.fxml
+++ b/src/main/resources/assets/minosoft/eros/main/main.fxml
@@ -71,7 +71,7 @@
                     </GridPane.margin>
                 </FontIcon>
             </GridPane>
-            <GridPane onMouseClicked="#openAccountActivity" styleClass="context-menu" GridPane.columnIndex="3">
+            <GridPane fx:id="accountFX" onMouseClicked="#openAccountActivity" styleClass="context-menu" GridPane.columnIndex="3">
                 <columnConstraints>
                     <ColumnConstraints hgrow="NEVER" minWidth="10.0"/>
                     <ColumnConstraints hgrow="NEVER"/>