diff --git a/src/components/Delegations.js b/src/components/Delegations.js
index 652fc976..cb24e568 100644
--- a/src/components/Delegations.js
+++ b/src/components/Delegations.js
@@ -45,7 +45,7 @@ class Delegations extends React.Component {
   }
 
   async componentDidUpdate(prevProps, prevState) {
-    if (prevProps.validator !== this.props.validator && this.props.validator) {
+    if (this.state.validatorModal.validator !== this.props.validator && this.props.validator) {
       this.showValidatorModal(this.props.validator)
     }
 
diff --git a/src/components/NetworkFinder.js b/src/components/NetworkFinder.js
index 0ad6a9aa..222e0752 100644
--- a/src/components/NetworkFinder.js
+++ b/src/components/NetworkFinder.js
@@ -187,7 +187,14 @@ function NetworkFinder() {
       network.load().then(() => {
         return network.connect().then(() => {
           if (network.connected) {
-            changeNetwork(network)
+            setState({
+              active: grantMatch ? 'grants' : govMatch ? 'governance' : 'delegations',
+              network: network,
+              queryClient: network.queryClient,
+              validators: network.getValidators(),
+              operators: network.getOperators(),
+              loading: false
+            })
           } else {
             throw false
           }