diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
index ed1471d52..0133f789e 100644
--- a/gui/kivy/uix/screens.py
+++ b/gui/kivy/uix/screens.py
@@ -522,7 +522,12 @@ class AddressScreen(CScreen):
     def update(self):
         self.menu_actions = [('Receive', self.do_show), ('Details', self.do_view)]
         wallet = self.app.wallet
-        _list = wallet.get_change_addresses() if self.screen.show_change else wallet.get_receiving_addresses()
+        if self.screen.show_change == 0:
+            _list = wallet.get_receiving_addresses()
+        elif self.screen.show_change == 1:
+            _list = wallet.get_change_addresses()
+        else:
+            _list = wallet.get_addresses()
         search = self.screen.message
         container = self.screen.ids.search_container
         container.clear_widgets()
diff --git a/gui/kivy/uix/ui_screens/address.kv b/gui/kivy/uix/ui_screens/address.kv
index 3d594c9c3..d0247a342 100644
--- a/gui/kivy/uix/ui_screens/address.kv
+++ b/gui/kivy/uix/ui_screens/address.kv
@@ -50,7 +50,7 @@ AddressScreen:
     name: 'address'
     message: ''
     pr_status: 'Pending'
-    show_change: False
+    show_change: 0
     show_used: 0
     on_message:
         self.parent.update()
@@ -70,9 +70,9 @@ AddressScreen:
                 spacing: '5dp'
                 AddressButton:
                     id: search
-                    text: _('Change') if root.show_change else _('Receiving')
+                    text: {0:_('Receiving'), 1:_('Change'), 2:_('All')}[root.show_change]
                     on_release:
-                        root.show_change = not root.show_change
+                        root.show_change = (root.show_change + 1) % 3
                         Clock.schedule_once(lambda dt: app.address_screen.update())
             AddressFilter:
                 opacity: 1