diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx
index 4f133a116..b81806ad4 100644
--- a/ts/components/SplitViewContainer.tsx
+++ b/ts/components/SplitViewContainer.tsx
@@ -11,6 +11,7 @@ const StyledSplitView = styled.div`
   max-height: 100%;
   min-height: 0;
   display: flex;
+  flex-grow: 1;
   flex-direction: column;
 `;
 
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 5be7a8397..c62f79177 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -166,7 +166,7 @@ class ConvoController {
   public getNicknameOrRealUsernameOrPlaceholder(pubKey: string): string {
     const conversation = ConvoHub.use().get(pubKey);
     if (!conversation) {
-      return pubKey;
+      return PubKey.shorten(pubKey);
     }
     return conversation.getNicknameOrRealUsernameOrPlaceholder();
   }
diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts
index 563f1a6bc..ba98c6c62 100644
--- a/ts/session/types/PubKey.ts
+++ b/ts/session/types/PubKey.ts
@@ -88,7 +88,7 @@ export class PubKey {
     const pk = value instanceof PubKey ? valAny.key : value;
 
     if (!pk || pk.length < 8) {
-      throw new Error('PubKey.shorten was given an invalid PubKey to shorten.');
+      return pk;
     }
 
     return `(${pk.substring(0, 4)}...${pk.substring(pk.length - 4)})`;