diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 419aac5d1..482de6731 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2360,7 +2360,6 @@ button.ConversationDetails__action-button {
     }
 
     @include keyboard-mode {
-      border: none;
       &:focus {
         border-color: $color-ultramarine;
         outline: none;
diff --git a/ts/components/ProfileEditor.tsx b/ts/components/ProfileEditor.tsx
index 0c12c3b12..742c72943 100644
--- a/ts/components/ProfileEditor.tsx
+++ b/ts/components/ProfileEditor.tsx
@@ -264,7 +264,9 @@ export const ProfileEditor = ({
   const [avatarBuffer, setAvatarBuffer] = useState<Uint8Array | undefined>(
     undefined
   );
-  const [isLoadingAvatar, setIsLoadingAvatar] = useState(true);
+  const [isLoadingAvatar, setIsLoadingAvatar] = useState(
+    Boolean(profileAvatarPath)
+  );
   const [stagedProfile, setStagedProfile] = useState<ProfileDataType>({
     aboutEmoji,
     aboutText,