diff --git a/src/App.tsx b/src/App.tsx
index 4d0d3af..ec5b99d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -30,6 +30,7 @@ let theme = setHyperspaceTheme(getUserDefaultTheme());
 interface IAppState {
     theme: any;
     showLayout: boolean;
+    avatarURL?: string;
 }
 
 class App extends Component<any, IAppState> {
@@ -44,6 +45,7 @@ class App extends Component<any, IAppState> {
             showLayout:
                 userLoggedIn() && !window.location.hash.includes("#/welcome")
         };
+        this.setAvatarURL = this.setAvatarURL.bind(this);
     }
 
     componentWillMount() {
@@ -85,6 +87,12 @@ class App extends Component<any, IAppState> {
         }
     }
 
+    setAvatarURL(avatarURL: string) {
+        this.setState({
+            avatarURL
+        });
+    }
+
     render() {
         this.removeBodyBackground();
 
@@ -93,7 +101,9 @@ class App extends Component<any, IAppState> {
                 <CssBaseline />
                 <Route path="/welcome" component={WelcomePage} />
                 <div>
-                    {this.state.showLayout ? <AppLayout /> : null}
+                    {this.state.showLayout ? (
+                        <AppLayout avatarURL={this.state.avatarURL} />
+                    ) : null}
                     <PrivateRoute
                         exact
                         path="/"
@@ -155,7 +165,9 @@ class App extends Component<any, IAppState> {
                     <PrivateRoute path="/search" component={SearchPage} />
                     <PrivateRoute path="/settings" component={Settings} />
                     <PrivateRoute path="/blocked" component={Blocked} />
-                    <PrivateRoute path="/you" component={You} />
+                    <PrivateRoute path="/you">
+                        <You onAvatarUpdate={this.setAvatarURL} />
+                    </PrivateRoute>
                     <PrivateRoute path="/about" component={AboutPage} />
                     <PrivateRoute path="/compose" component={Composer} />
                     <PrivateRoute
diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx
index c0fda03..1857f4c 100644
--- a/src/components/AppLayout/AppLayout.tsx
+++ b/src/components/AppLayout/AppLayout.tsx
@@ -698,7 +698,9 @@ export class AppLayout extends Component<any, IAppLayoutState> {
                                             }
                                             alt="You"
                                             src={
-                                                this.state.currentUser
+                                                this.props.avatarURL
+                                                    ? this.props.avatarURL
+                                                    : this.state.currentUser
                                                     ? this.state.currentUser
                                                           .avatar_static
                                                     : ""
@@ -733,8 +735,11 @@ export class AppLayout extends Component<any, IAppLayoutState> {
                                                     <Avatar
                                                         alt="You"
                                                         src={
-                                                            this.state
-                                                                .currentUser
+                                                            this.props.avatarURL
+                                                                ? this.props
+                                                                      .avatarURL
+                                                                : this.state
+                                                                      .currentUser
                                                                 ? this.state
                                                                       .currentUser
                                                                       .avatar_static
diff --git a/src/pages/You.tsx b/src/pages/You.tsx
index 47fcc00..9885948 100644
--- a/src/pages/You.tsx
+++ b/src/pages/You.tsx
@@ -16,6 +16,7 @@ import filedialog from "file-dialog";
 
 interface IYouProps extends withSnackbarProps {
     classes: any;
+    onAvatarUpdate: Function;
 }
 
 interface IYouState {
@@ -106,6 +107,9 @@ class You extends Component<IYouProps, IYouState> {
                             this.props.enqueueSnackbar(
                                 "Avatar updated successfully."
                             );
+                            this.props.onAvatarUpdate(
+                                currentAccount.avatar_static
+                            );
                         })
                         .catch((err: Error) => {
                             this.props.closeSnackbar("persistAvatar");