diff --git a/briar-gtk/briar_gtk/actions/registration.py b/briar-gtk/briar_gtk/actions/registration.py
index 1b50fee3dc224c1d7953f8a5294f4a63d5276808..3e7daaef6c2b5a78a80dcd2368afdf0ff0ef953b 100644
--- a/briar-gtk/briar_gtk/actions/registration.py
+++ b/briar-gtk/briar_gtk/actions/registration.py
@@ -16,11 +16,20 @@ class RegistrationActions(Actions):
 
     def _setup_actions(self):
         self._setup_proceed_from_nickname_action()
+        self._setup_return_from_passwords_action()
 
     def _setup_proceed_from_nickname_action(self):
         self._setup_action("proceed-from-nickname", None,
                            self._proceed_from_nickname)
 
+    def _setup_return_from_passwords_action(self):
+        self._setup_action("return-from-passwords", None,
+                           self._return_from_passwords)
+
     # pylint: disable=unused-argument
     def _proceed_from_nickname(self, action, parameter):
         self.widget.proceed_from_nickname()
+
+    # pylint: disable=unused-argument
+    def _return_from_passwords(self, action, parameter):
+        self.widget.show_nickname_page()
diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/containers/registration.py
index 360881eac9056948867ebc1720f776c39906bdbe..177b965849dee09984d1a0d1da76194d62f3a36c 100644
--- a/briar-gtk/briar_gtk/containers/registration.py
+++ b/briar-gtk/briar_gtk/containers/registration.py
@@ -87,11 +87,7 @@ class RegistrationContainer(Container):
     def _on_passwords_enter(self, event):
         self.on_create_account_pressed(None)
 
-    # pylint: disable=unused-argument
-    def on_create_account_back_pressed(self, button):
-        self._show_nickname_page()
-
-    def _show_nickname_page(self):
+    def show_nickname_page(self):
         nickname_page = self.builder.get_object("nickname_page")
         self.registration_flow_stack.set_visible_child(nickname_page)
 
diff --git a/briar-gtk/data/ui/registration.ui b/briar-gtk/data/ui/registration.ui
index 49a1e8d852121ead5dccf73c0b90892f5c809118..77515966d12c0367a16116e33c654fe5b4016395 100644
--- a/briar-gtk/data/ui/registration.ui
+++ b/briar-gtk/data/ui/registration.ui
@@ -254,7 +254,7 @@
           <object class="GtkButton">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <signal name="clicked" handler="on_create_account_back_pressed"/>
+            <property name="action_name">registration.return-from-passwords</property>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>