diff --git a/applications/tari_console_wallet/src/ui/components/send_tab.rs b/applications/tari_console_wallet/src/ui/components/send_tab.rs
index 845abbfff4..2849ae00bb 100644
--- a/applications/tari_console_wallet/src/ui/components/send_tab.rs
+++ b/applications/tari_console_wallet/src/ui/components/send_tab.rs
@@ -626,13 +626,17 @@ impl<B: Backend> Component<B> for SendTab {
     }
 
     fn on_key(&mut self, app_state: &mut AppState, c: char) {
-        if self.error_message.is_some() && '\n' == c {
-            self.error_message = None;
+        if self.error_message.is_some() {
+            if '\n' == c {
+                self.error_message = None;
+            }
             return;
         }
 
-        if self.success_message.is_some() && '\n' == c {
-            self.success_message = None;
+        if self.success_message.is_some() {
+            if '\n' == c {
+                self.success_message = None;
+            }
             return;
         }
 
diff --git a/applications/tari_console_wallet/src/ui/components/transactions_tab.rs b/applications/tari_console_wallet/src/ui/components/transactions_tab.rs
index d91f2c1bf6..b3ca589452 100644
--- a/applications/tari_console_wallet/src/ui/components/transactions_tab.rs
+++ b/applications/tari_console_wallet/src/ui/components/transactions_tab.rs
@@ -552,6 +552,9 @@ impl<B: Backend> Component<B> for TransactionsTab {
     }
 
     fn on_up(&mut self, app_state: &mut AppState) {
+        if self.confirmation_dialog {
+            return;
+        }
         match self.selected_tx_list {
             SelectedTransactionList::None => {},
             SelectedTransactionList::PendingTxs => {
@@ -575,6 +578,9 @@ impl<B: Backend> Component<B> for TransactionsTab {
     }
 
     fn on_down(&mut self, app_state: &mut AppState) {
+        if self.confirmation_dialog {
+            return;
+        }
         match self.selected_tx_list {
             SelectedTransactionList::None => {},
             SelectedTransactionList::PendingTxs => {
@@ -602,6 +608,7 @@ impl<B: Backend> Component<B> for TransactionsTab {
         self.pending_list_state.select(None);
         self.completed_list_state.select(None);
         self.detailed_transaction = None;
+        self.confirmation_dialog = false;
     }
 }