diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index a2b0141b3..4193a09cd 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -4916,6 +4916,10 @@ button.module-calling-participants-list__contact {
     scrollbar-gutter: stable;
   }
 
+  &--has-dialog-padding {
+    padding-block-start: 8px;
+  }
+
   &__item {
     &--archive-button {
       @include mixins.button-reset;
@@ -5614,10 +5618,6 @@ button.module-calling-participants-list__contact {
   }
 }
 
-.module-left-pane__dialogs {
-  margin-bottom: 8px;
-}
-
 .module-left-pane__header {
   flex-grow: 0;
   flex-shrink: 0;
diff --git a/ts/components/ConversationList.tsx b/ts/components/ConversationList.tsx
index 1ccd35455..cfcb2872c 100644
--- a/ts/components/ConversationList.tsx
+++ b/ts/components/ConversationList.tsx
@@ -194,6 +194,7 @@ export type PropsType = {
   scrollToRowIndex?: number;
   shouldRecomputeRowHeights: boolean;
   scrollable?: boolean;
+  hasDialogPadding?: boolean;
 
   getPreferredBadge: PreferredBadgeSelectorType;
   i18n: LocalizerType;
@@ -241,6 +242,7 @@ export function ConversationList({
   scrollBehavior = ScrollBehavior.Default,
   scrollToRowIndex,
   scrollable = true,
+  hasDialogPadding = false,
   shouldRecomputeRowHeights,
   showChooseGroupMembers,
   showFindByUsername,
@@ -583,7 +585,8 @@ export function ConversationList({
     <ListView
       className={classNames(
         'module-conversation-list',
-        `module-conversation-list--width-${widthBreakpoint}`
+        `module-conversation-list--width-${widthBreakpoint}`,
+        hasDialogPadding && 'module-conversation-list--has-dialog-padding'
       )}
       width={dimensions.width}
       height={dimensions.height}
diff --git a/ts/components/LeftPane.tsx b/ts/components/LeftPane.tsx
index 42e51f6f4..e1b0801bb 100644
--- a/ts/components/LeftPane.tsx
+++ b/ts/components/LeftPane.tsx
@@ -687,6 +687,8 @@ export function LeftPane({
   const showBackupMediaDownloadProgress =
     !hideHeader && !backupMediaDownloadProgress.downloadBannerDismissed;
 
+  const hasDialogs = dialogs.length ? !hideHeader : false;
+
   return (
     <NavSidebar
       title={i18n('icu:LeftPane--chats')}
@@ -779,7 +781,7 @@ export function LeftPane({
           </NavSidebarSearchHeader>
         )}
 
-        {dialogs.length && !hideHeader ? (
+        {hasDialogs ? (
           <div className="module-left-pane__dialogs">
             {dialogs.map(({ key, dialog }) => (
               <React.Fragment key={key}>{dialog}</React.Fragment>
@@ -812,6 +814,7 @@ export function LeftPane({
                 getPreferredBadge={getPreferredBadge}
                 getRow={getRow}
                 i18n={i18n}
+                hasDialogPadding={hasDialogs}
                 onClickArchiveButton={showArchivedConversations}
                 onClickContactCheckbox={(
                   conversationId: string,