2 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/components/app-header/app-header.component.js b/ui/app/components/app-header/app-header.component.js
index 62b04562a..07ca6cf84 100644
--- a/ui/app/components/app-header/app-header.component.js
+++ b/ui/app/components/app-header/app-header.component.js
@@ -91,7 +91,6 @@ class AppHeader extends Component {
       network,
       provider,
       history,
-      location,
       isUnlocked,
     } = this.props
 
@@ -126,7 +125,7 @@ class AppHeader extends Component {
                 network={network}
                 provider={provider}
                 onClick={event => this.handleNetworkIndicatorClick(event)}
-                disabled={location.pathname === CONFIRM_TRANSACTION_ROUTE}
+                disabled={this.isConfirming()}
               />
             </div>
             { this.renderAccountMenu() }
diff --git a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
index 29ee5eedc..d4581e8ed 100644
--- a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
+++ b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
@@ -61,7 +61,7 @@ export default class ConfirmTransaction extends Component {
       setTransactionToConfirm(paramsTransactionId)
     }
 
-    if (!paramsTransactionId) {
+    if (!transactionId) {
       this.setTransactionToConfirm()
     }
   }
@@ -84,7 +84,8 @@ export default class ConfirmTransaction extends Component {
         setTransactionToConfirm(paramsTransactionId)
       }
     } else if (unconfirmedTransactions.length) {
-      const transactionId = unconfirmedTransactions[0].id
+      const totalUnconfirmed = unconfirmedTransactions.length
+      const transactionId = unconfirmedTransactions[totalUnconfirmed - 1].id
       setTransactionToConfirm(transactionId)
     }
   }