diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm
index 212bfdefe7a..52149e8108f 100644
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -203,7 +203,7 @@ LinkTradeMenu:
 
 .MenuAction:
 	ld hl, w2DMenuFlags2
-	res 7, [hl]
+	res _2DMENU_EXITING_F, [hl]
 	ldh a, [hBGMapMode]
 	push af
 	call .loop
@@ -219,7 +219,7 @@ LinkTradeMenu:
 	farcall _2DMenuInterpretJoypad
 	jr c, .done
 	ld a, [w2DMenuFlags1]
-	bit 7, a
+	bit _2DMENU_DISABLE_JOYPAD_FILTER_F, a
 	jr nz, .done
 	call .GetJoypad
 	ld b, a
@@ -247,7 +247,7 @@ LinkTradeMenu:
 	call .TryAnims
 	ret c
 	ld a, [w2DMenuFlags1]
-	bit 7, a
+	bit _2DMENU_DISABLE_JOYPAD_FILTER_F, a
 	jr z, .loop2
 	and a
 	ret
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 4004d9c1bd0..78a429c82ab 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -32,7 +32,7 @@ _InterpretMobileMenu::
 	call ApplyTilemap
 	call Init2DMenuCursorPosition
 	ld hl, w2DMenuFlags1
-	set 7, [hl]
+	set _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
 .loop
 	call DelayFrame
 	farcall Function10032e