diff --git a/imports/ui/components/DocumentsList.js b/imports/ui/components/DocumentsList.js
index 93e91e3..2c36e26 100644
--- a/imports/ui/components/DocumentsList.js
+++ b/imports/ui/components/DocumentsList.js
@@ -1,10 +1,17 @@
 import React from 'react';
+import { browserHistory } from 'react-router';
 import { ListGroup, ListGroupItem, Alert } from 'react-bootstrap';
 
+const handleNav = (_id) => {
+  browserHistory.push(`/documents/${_id}`);
+}
+
 const DocumentsList = ({ documents }) => (
   documents.length > 0 ? <ListGroup className="DocumentsList">
     {documents.map(({ _id, title }) => (
-      <ListGroupItem key={ _id } href={`/documents/${_id}`}>{ title }</ListGroupItem>
+      <ListGroupItem key={ _id } onClick={ () => handleNav(_id) }>
+        { title }
+      </ListGroupItem>
     ))}
   </ListGroup> :
   <Alert bsStyle="warning">No documents yet.</Alert>
diff --git a/imports/ui/pages/Documents.js b/imports/ui/pages/Documents.js
index 6979193..f5a12fd 100644
--- a/imports/ui/pages/Documents.js
+++ b/imports/ui/pages/Documents.js
@@ -1,7 +1,13 @@
 import React from 'react';
+import { browserHistory } from 'react-router';
 import { Row, Col, Button } from 'react-bootstrap';
 import DocumentsList from '../containers/DocumentsList.js';
 
+const buttonNav = (event) => {
+  event.preventDefault();
+  browserHistory.push('/documents/new');
+}
+
 const Documents = () => (
   <div className="Documents">
     <Row>
@@ -11,7 +17,7 @@ const Documents = () => (
           <Button
             bsStyle="success"
             className="pull-right"
-            href="/documents/new"
+            onClick={ buttonNav }
           >New Document</Button>
         </div>
         <DocumentsList />
diff --git a/imports/ui/pages/ViewDocument.js b/imports/ui/pages/ViewDocument.js
index f3f7183..48202a1 100644
--- a/imports/ui/pages/ViewDocument.js
+++ b/imports/ui/pages/ViewDocument.js
@@ -4,6 +4,10 @@ import { browserHistory } from 'react-router';
 import { Bert } from 'meteor/themeteorchef:bert';
 import { removeDocument } from '../../api/documents/methods.js';
 
+const handleEdit = (_id) => {
+  browserHistory.push(`/documents/${_id}/edit`);
+}
+
 const handleRemove = (_id) => {
   if (confirm('Are you sure? This is permanent!')) {
     removeDocument.call({ _id }, (error) => {
@@ -23,7 +27,7 @@ const ViewDocument = ({ doc }) => (
       <h4 className="pull-left">{ doc.title }</h4>
       <ButtonToolbar className="pull-right">
         <ButtonGroup bsSize="small">
-          <Button href={`/documents/${doc._id}/edit`}>Edit</Button>
+          <Button onClick={ () => handleEdit(doc._id) }>Edit</Button>
           <Button onClick={ () => handleRemove(doc._id) } className="text-danger">Delete</Button>
         </ButtonGroup>
       </ButtonToolbar>