diff --git a/screen/lnd/browser.js b/screen/lnd/browser.js
index c8d1ea1a8..72f72bda3 100644
--- a/screen/lnd/browser.js
+++ b/screen/lnd/browser.js
@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
-import { View, Alert } from 'react-native';
+import { View, Alert, Dimensions } from 'react-native';
 import { WebView } from 'react-native-webview';
 import { BlueNavigationStyle } from '../../BlueComponents';
 import { FormInput } from 'react-native-elements';
 import Ionicons from 'react-native-vector-icons/Ionicons';
 import PropTypes from 'prop-types';
+const { width } = Dimensions.get('window');
 
 export default class Browser extends Component {
   static navigationOptions = ({ navigation }) => ({
@@ -15,6 +16,8 @@ export default class Browser extends Component {
 
   constructor(props) {
     super(props);
+    if (!props.navigation.getParam('fromSecret')) throw new Error('Invalid param');
+
     this.state = { url: '' };
   }
 
@@ -31,16 +34,15 @@ export default class Browser extends Component {
             style={{
               color: 'red',
               backgroundColor: 'transparent',
-              minWidth:36,
-              paddingLeft:10,
               left: 8,
               top: 1,
             }}
           />
 
           <FormInput
-            inputStyle={{ color: '#0c2550', maxWidth: 300, fontSize: 16 }}
+            inputStyle={{ color: '#0c2550', fontSize: 16 }}
             containerStyle={{
+              maxWidth: width - 100,
               borderColor: '#d2d2d2',
               borderWidth: 0.5,
               backgroundColor: '#f5f5f5',
@@ -170,6 +172,7 @@ export default class Browser extends Component {
 
 Browser.propTypes = {
   navigation: PropTypes.shape({
+    getParam: PropTypes.function,
     navigate: PropTypes.func,
   }),
 };
diff --git a/screen/lnd/manageFunds.js b/screen/lnd/manageFunds.js
index a8c36338c..bf4116063 100644
--- a/screen/lnd/manageFunds.js
+++ b/screen/lnd/manageFunds.js
@@ -18,6 +18,7 @@ export default class ManageFunds extends Component {
   constructor(props) {
     super(props);
     this.onWalletSelect = this.onWalletSelect.bind(this);
+    if (!props.navigation.getParam('fromWallet')) throw new Error('Invalid param');
 
     this.state = { fromWallet: props.navigation.getParam('fromWallet') };
   }
diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js
index adbec1db1..342fc5974 100644
--- a/screen/wallets/transactions.js
+++ b/screen/wallets/transactions.js
@@ -390,7 +390,7 @@ export default class WalletTransactions extends Component {
                     style={{ alignSelf: 'flex-end', right: 10, top: -5, flexDirection: 'row' }}
                     onPress={() => {
                       console.log('navigating to', this.state.wallet.getLabel());
-                      navigate('ManageFunds', { fromSecret: this.state.wallet.getSecret() });
+                      navigate('ManageFunds', { fromWallet: this.state.wallet });
                     }}
                   >
                     <BlueText style={{ fontWeight: '600', fontSize: 16 }}>{loc.lnd.title}</BlueText>