diff --git a/js/background.js b/js/background.js
index 82f6c44b6..583ad636d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1014,6 +1014,13 @@
     });
 
     Whisper.events.on('onShowUserDetails', async ({ userPubKey }) => {
+      const isMe = userPubKey === textsecure.storage.user.getNumber();
+
+      if (isMe) {
+        Whisper.events.trigger('onEditProfile');
+        return;
+      }
+
       const conversation = await ConversationController.getOrCreateAndWait(
         userPubKey,
         'private'
diff --git a/ts/components/Avatar.tsx b/ts/components/Avatar.tsx
index fd57617ff..61cc729c3 100644
--- a/ts/components/Avatar.tsx
+++ b/ts/components/Avatar.tsx
@@ -54,10 +54,7 @@ export class Avatar extends React.PureComponent<Props, State> {
       return this.renderNoImage();
     }
 
-    const borderStyle = this.getBorderStyle(
-      borderColor,
-      borderWidth,
-    );
+    const borderStyle = this.getBorderStyle(borderColor, borderWidth);
 
     // Generate the seed
     const hash = phoneNumber.substring(0, 12);
@@ -215,11 +212,11 @@ export class Avatar extends React.PureComponent<Props, State> {
     const borderWidth = typeof width === 'number' ? width : 3;
 
     return color
-    ? {
-        borderColor: color,
-        borderStyle: 'solid',
-        borderWidth: borderWidth,
-      }
-    : undefined;
+      ? {
+          borderColor: color,
+          borderStyle: 'solid',
+          borderWidth: borderWidth,
+        }
+      : undefined;
   }
 }