diff --git a/src/components/Menu/Menu.js b/src/components/Menu/Menu.js
index 143b96e..3bbf397 100644
--- a/src/components/Menu/Menu.js
+++ b/src/components/Menu/Menu.js
@@ -103,7 +103,7 @@ const Main = inject("rootStore") ( observer(
                 Home
               </Menu.Item>
   
-              <Menu.Item name='/passwords' active={activeItem === '/passwords'} onClick={this.handleItemClick} as='a'>
+              <Menu.Item name='/p' active={activeItem === '/p'} onClick={this.handleItemClick} as='a'>
                 Password manager
               </Menu.Item>
     
@@ -138,7 +138,7 @@ const Main = inject("rootStore") ( observer(
                 Home
               </Menu.Item>
 
-              <Menu.Item name="/passwords" active={activeItem === '/passwords'} onClick={this.handleItemClick} as='a'>
+              <Menu.Item name="/p" active={activeItem === '/p'} onClick={this.handleItemClick} as='a'>
                 Password manager
               </Menu.Item>
 
diff --git a/src/components/PasswordManager/New.js b/src/components/PasswordManager/New.js
index 598a291..c02d64a 100644
--- a/src/components/PasswordManager/New.js
+++ b/src/components/PasswordManager/New.js
@@ -76,6 +76,7 @@ const New = inject("rootStore") ( observer(
 
     componentWillReceiveProps(nextProps) {
       if(nextProps.open !== this.props.open) {
+        //Empty input fields
         this.setState({
           url: '',
           login: '',
@@ -85,6 +86,13 @@ const New = inject("rootStore") ( observer(
     }
 
 
+    componentDidUpdate() {
+      if(this.props.open && this.state.url === '' && this.state.login === '') {
+        document.getElementById('url').focus();
+      }
+    }
+
+
     componentWillUnmount() {
       this.sheet.detach()
     }
@@ -169,7 +177,7 @@ const New = inject("rootStore") ( observer(
                   <Form.Field>
                     <label>Application / URL:</label>
                     <Input iconPosition='left' placeholder='http://exmple.com'>
-                      <input value={this.state.url} type="text" name="url" onChange={this.handleChange} autoComplete="off" required />
+                      <input value={this.state.url} type="text" name="url" id="url" onChange={this.handleChange} autoComplete="off" required />
                     </Input>
                   </Form.Field>
 
diff --git a/src/pages/Main.js b/src/pages/Main.js
index 69c30f6..92ecb4a 100644
--- a/src/pages/Main.js
+++ b/src/pages/Main.js
@@ -76,7 +76,7 @@ class Main extends Component {
             <Segment className={this.classes.mainSegment} padded="very">
               <Switch>
                 <Route exact path="/" component={Home} />
-                <Route path="/passwords" component={PasswordManager} />
+                <Route path="/p" component={PasswordManager} />
               </Switch>
               <img alt="" className={this.classes.ninja} src={require('../files/images/ninja.svg')} />
             </Segment>
diff --git a/src/pages/passwordManager/PasswordManager.js b/src/pages/passwordManager/PasswordManager.js
index 7a977f6..244c2cb 100644
--- a/src/pages/passwordManager/PasswordManager.js
+++ b/src/pages/passwordManager/PasswordManager.js
@@ -76,6 +76,9 @@ const PasswordManager = inject("rootStore") ( observer(
 
     componentDidMount() {
       this.fetchData();
+
+      //Focus on search input
+      document.getElementById('search').focus();
     }
 
 
@@ -230,7 +233,7 @@ const PasswordManager = inject("rootStore") ( observer(
           <Headline black="Password " red="manager" />
 
           <Input icon placeholder='Search...'>
-            <input type='text' placeholder='Search...' name="search" onChange={this.onChangeInput} autoComplete="off" />
+            <input type='text' id="search" placeholder='Search...' name="search" onChange={this.onChangeInput} autoComplete="off" />
             <Icon name='search' />
           </Input>