diff --git a/ui/page/governance/proposals_page.go b/ui/page/governance/proposals_page.go
index a96e84a72..2ed797bcd 100644
--- a/ui/page/governance/proposals_page.go
+++ b/ui/page/governance/proposals_page.go
@@ -136,7 +136,7 @@ func NewProposalsPage(l *load.Load, detailData interface{}) *ProposalsPage {
 	if detailData != nil {
 		pg.proposal = detailData.(*libwallet.Proposal)
 		time.AfterFunc(time.Millisecond*200, func() { // wait for the page to be displayed
-			pg.ParentNavigator().Display(NewProposalDetailsPage(pg.Load, pg.proposal))
+			pg.ParentWindow().Display(NewProposalDetailsPage(pg.Load, pg.proposal))
 		})
 	}
 
@@ -254,7 +254,7 @@ func (pg *ProposalsPage) HandleUserInteractions(gtx C) {
 	if clicked, selectedItem := pg.proposalsList.ItemClicked(); clicked {
 		proposalItems := pg.scroll.FetchedData()
 		selectedProposal := proposalItems[selectedItem].Proposal
-		pg.ParentNavigator().Display(NewProposalDetailsPage(pg.Load, &selectedProposal))
+		pg.ParentWindow().Display(NewProposalDetailsPage(pg.Load, &selectedProposal))
 	}
 
 	for pg.syncButton.Clicked(gtx) {
diff --git a/ui/page/root/wallet_selector_page.go b/ui/page/root/wallet_selector_page.go
index 6e0ec30d2..92c87c258 100644
--- a/ui/page/root/wallet_selector_page.go
+++ b/ui/page/root/wallet_selector_page.go
@@ -202,8 +202,8 @@ func (pg *WalletSelectorPage) HandleUserInteractions(gtx C) {
 		// Create a local copy of asset for each iteration
 		asset := asset
 		if clickable.Clicked(gtx) {
-			pg.ParentNavigator().Display(components.NewCreateWallet(pg.Load, func(_ sharedW.Asset) {
-				pg.ParentNavigator().ClosePagesAfter(WalletSelectorPageID)
+			pg.ParentWindow().Display(components.NewCreateWallet(pg.Load, func(_ sharedW.Asset) {
+				pg.ParentWindow().CloseCurrentPage()
 				// enable sync for the newly created wallet
 				wallets, wExists := pg.walletsList[asset]
 				var mostRecentWallet *walletWithBalance