diff --git a/briar-gtk/briar_gtk/actions/registration.py b/briar-gtk/briar_gtk/actions/registration.py
index a43875b457ea1818eecc8c4a9ca61c8e29a9bbd2..b771833e483eb27ad7619b3770f5cb941cbd888a 100644
--- a/briar-gtk/briar_gtk/actions/registration.py
+++ b/briar-gtk/briar_gtk/actions/registration.py
@@ -15,4 +15,11 @@ class RegistrationActions(Actions):
         self._setup_actions()
 
     def _setup_actions(self):
-        pass
+        self._setup_proceed_from_nickname_action()
+
+    def _setup_proceed_from_nickname_action(self):
+        self._setup_action("proceed-from-nickname", None, self._proceed_from_nickname)
+
+    # pylint: disable=unused-argument
+    def _proceed_from_nickname(self, action, parameter):
+        self.widget.proceed_from_nickname()
diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/containers/registration.py
index 7a19a0d80cdc0d7d29c4c60863090d18402fb86a..360881eac9056948867ebc1720f776c39906bdbe 100644
--- a/briar-gtk/briar_gtk/containers/registration.py
+++ b/briar-gtk/briar_gtk/containers/registration.py
@@ -51,10 +51,10 @@ class RegistrationContainer(Container):
 
     # pylint: disable=unused-argument
     def _on_nickname_enter(self, event):
-        self.on_nickname_next_pressed(None)
+        self.proceed_from_nickname()
 
     # pylint: disable=unused-argument
-    def on_nickname_next_pressed(self, button):
+    def proceed_from_nickname(self):
         nickname_error_label = self.builder.get_object("nickname_error_label")
         if self._nickname_is_empty():
             nickname_error_label.show()
diff --git a/briar-gtk/data/ui/registration.ui b/briar-gtk/data/ui/registration.ui
index bafce113b419c163346c438e28f61d40eec995cd..49a1e8d852121ead5dccf73c0b90892f5c809118 100644
--- a/briar-gtk/data/ui/registration.ui
+++ b/briar-gtk/data/ui/registration.ui
@@ -230,7 +230,7 @@
             <property name="use_underline">True</property>
             <property name="can_focus">True</property>
             <property name="label" translatable="yes">Next</property>
-            <signal name="clicked" handler="on_nickname_next_pressed"/>
+            <property name="action_name" translatable="yes">registration.proceed-from-nickname</property>
             <style>
               <class name="suggested-action"/>
             </style>