bugfix: default menu position in custom path address format menu

diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md
index b1bb3de..6d53202 100644
--- a/releases/Next-ChangeLog.md
+++ b/releases/Next-ChangeLog.md
@@ -4,6 +4,7 @@ This lists the new changes that have not yet been published in a normal release.
 
 # Shared Improvements - Both Mk and Q
 
+- Bugfix: Custom address default menu position wrong
 - Bugfix: Delta Mode Trick PIN was never restored from backup
 - Bugfix: Proper error message for incorrect 7z headers
 - Bugfix: Exiting nickname entry with nickname already saved deleted previous nickname
diff --git a/shared/address_explorer.py b/shared/address_explorer.py
index 838c815..0ea9082 100644
--- a/shared/address_explorer.py
+++ b/shared/address_explorer.py
@@ -126,9 +126,10 @@ class PickAddrFmtMenu(MenuSystem):
             for af in chains.SINGLESIG_AF
         ]
         super().__init__(items)
-        if path.startswith("m/84h"):
+        # below is sensitive to order in chains.SINGLESIG_AF
+        if path.startswith("m/44h"):
             self.goto_idx(1)
-        if path.startswith("m/49h"):
+        elif path.startswith("m/49h"):
             self.goto_idx(2)
 
     async def done(self, _1, _2, item):
diff --git a/shared/chains.py b/shared/chains.py
index 9d53847..4833251 100644
--- a/shared/chains.py
+++ b/shared/chains.py
@@ -12,7 +12,7 @@ from serializations import hash160, ser_compact_size, disassemble
 from ucollections import namedtuple
 from opcodes import OP_RETURN, OP_1, OP_16
 
-
+# DO NOT CHANGE ORDER! PickAddrFmtMenu.__init__ expects correct order
 SINGLESIG_AF = (AF_P2WPKH, AF_CLASSIC, AF_P2WPKH_P2SH)
 
 # See SLIP 132 <https://github.com/satoshilabs/slips/blob/master/slip-0132.md>
diff --git a/testing/test_address_explorer.py b/testing/test_address_explorer.py
index de35d86..2d3bcf5 100644
--- a/testing/test_address_explorer.py
+++ b/testing/test_address_explorer.py
@@ -555,6 +555,46 @@ def test_custom_path(path_sidx, which_fmt, addr_vs_path, pick_menu_item, goto_ad
             addr_vs_path(a, p, addr_fmt=which_fmt)
 
 
+@pytest.mark.parametrize("prefix,label", [
+    ("m/84h", "Segwit P2WPKH"),
+    ("m/49h", "P2SH-Segwit"),
+    ("m/44h", "Classic P2PKH"),
+])
+def test_pick_addr_fmt_menu_default(prefix, label, goto_address_explorer, is_q1, sim_exec,
+                                    pick_menu_item, need_keypress, press_select, cap_screen,
+                                    cap_story, use_testnet):
+    # PickAddrFmtMenu must pre-select the natural address format for common BIP paths
+    use_testnet()
+    goto_address_explorer()
+    pick_menu_item("Custom Path")
+    pick_menu_item(prefix + "/⋯")
+    need_keypress("0")
+    press_select()
+    path_to_pick = prefix + "/0h" if is_q1 else "⋯/0h"
+    pick_menu_item(path_to_pick)
+    time.sleep(.2)
+    # currently sitting at address format choice menu
+    cur_label = sim_exec(
+        'from ux import the_ux; top = the_ux.top_of_stack();'
+        'RV.write(top.items[top.cursor].label)'
+    )
+    assert cur_label == label, ("For %s: expected cursor on '%s', got '%s'" % (prefix, label, cur_label))
+
+    # choose menu item we're currently at
+    press_select()
+    need_keypress("3")
+    time.sleep(.2)
+    title, story = cap_story()
+    addr = addr_from_display_format(story.split("\n\n")[1].split("\n")[1])
+    if prefix == "m/84h":
+        assert addr.startswith("tb1")
+    elif prefix == "m/49h":
+        assert addr.startswith("2")
+    else:
+        assert addr.startswith("m") or addr.startswith("n")
+
+    # EOF
+
 def test_change_account_cancel(goto_address_explorer, pick_menu_item, press_cancel, cap_menu):
     goto_address_explorer()
     time.sleep(.2)