diff --git a/components/InlineButton.qml b/components/InlineButton.qml
index 45cf841c..402dade2 100644
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -125,6 +125,8 @@ Item {
         source: rect
     }
 
+    Keys.enabled: inlineButton.visible
     Keys.onSpacePressed: doClick()
+    Keys.onEnterPressed: Keys.onReturnPressed(event)
     Keys.onReturnPressed: doClick()
 }
diff --git a/components/InputDialog.qml b/components/InputDialog.qml
index 2a69e79f..0bd2c5f4 100644
--- a/components/InputDialog.qml
+++ b/components/InputDialog.qml
@@ -110,6 +110,8 @@ Item {
                     color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
                 }
 
+                Keys.enabled: root.visible
+                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
                     root.close()
                     root.accepted()
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 18bccdfe..587d484e 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -254,6 +254,7 @@ Item {
                 }
 
                 Keys.enabled: root.visible
+                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
                     root.close()
                     if (passwordDialogMode) {
@@ -352,6 +353,8 @@ Item {
                     }
                 }
 
+                Keys.enabled: root.visible
+                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
                     if (passwordInput1.text === passwordInput2.text) {
                         root.close()
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 28572245..77cd2dad 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -146,6 +146,8 @@ Item {
         cursorShape: Qt.PointingHandCursor
     }
 
+    Keys.enabled: button.visible
     Keys.onSpacePressed: doClick()
+    Keys.onEnterPressed: Keys.onReturnPressed(event)
     Keys.onReturnPressed: doClick()
 }