diff --git a/app/components/Button.js b/app/components/Button.js
index 6600e4a7..e064b55a 100644
--- a/app/components/Button.js
+++ b/app/components/Button.js
@@ -81,7 +81,7 @@ const Label = styled.span`
   ${props => props.hasIcon && 'padding-left: 4px;'};
 `;
 
-const Inner = styled.span`
+export const Inner = styled.span`
   display: flex;
   padding: 0 8px;
   padding-right: ${props => (props.disclosure ? 2 : 8)}px;
diff --git a/app/scenes/Search/components/FilterOptions.js b/app/scenes/Search/components/FilterOptions.js
index 7ab5b589..a2aa8b14 100644
--- a/app/scenes/Search/components/FilterOptions.js
+++ b/app/scenes/Search/components/FilterOptions.js
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { find } from 'lodash';
 import styled from 'styled-components';
 import Scrollable from 'components/Scrollable';
-import Button from 'components/Button';
+import Button, { Inner } from 'components/Button';
 import { DropdownMenu } from 'components/DropdownMenu';
 import FilterOption from './FilterOption';
 
@@ -68,6 +68,10 @@ const StyledButton = styled(Button)`
   &:hover {
     background: transparent;
   }
+
+  ${Inner} {
+    line-height: 28px;
+  }
 `;
 
 const SearchFilter = props => {
diff --git a/app/scenes/UserProfile.js b/app/scenes/UserProfile.js
index 2eaf32a4..8e1229a4 100644
--- a/app/scenes/UserProfile.js
+++ b/app/scenes/UserProfile.js
@@ -3,7 +3,7 @@ import * as React from 'react';
 import styled from 'styled-components';
 import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 import { inject, observer } from 'mobx-react';
-import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 import { EditIcon } from 'outline-icons';
 import Flex from 'shared/components/Flex';
 import HelpText from 'components/HelpText';
@@ -16,11 +16,13 @@ import Subheading from 'components/Subheading';
 import User from 'models/User';
 import DocumentsStore from 'stores/DocumentsStore';
 import AuthStore from 'stores/AuthStore';
+import { settings } from 'shared/utils/routeHelpers';
 
 type Props = {
   user: User,
   auth: AuthStore,
   documents: DocumentsStore,
+  history: Object,
   onRequestClose: () => *,
 };
 
@@ -51,7 +53,11 @@ class UserProfile extends React.Component<Props> {
             {user.isSuspended && <Badge>Suspended</Badge>}
             {isCurrentUser && (
               <Edit>
-                <Button to="/settings" as={Link} icon={<EditIcon />} neutral>
+                <Button
+                  onClick={() => this.props.history.push(settings())}
+                  icon={<EditIcon />}
+                  neutral
+                >
                   Edit Profile
                 </Button>
               </Edit>
@@ -88,4 +94,4 @@ const Meta = styled(HelpText)`
   margin-top: -12px;
 `;
 
-export default inject('documents', 'auth')(UserProfile);
+export default inject('documents', 'auth')(withRouter(UserProfile));