diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 509f5f10d..9e9ea35e9 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -4208,7 +4208,7 @@ button.module-image__border-overlay:focus {
     inset-inline-start: 0;
     position: absolute;
     top: 0;
-    z-index: $z-index-popup;
+    z-index: $z-index-calling;
   }
 
   &__title {
diff --git a/stylesheets/components/IncomingCallBar.scss b/stylesheets/components/IncomingCallBar.scss
index c6f2ebc26..b3a9eced0 100644
--- a/stylesheets/components/IncomingCallBar.scss
+++ b/stylesheets/components/IncomingCallBar.scss
@@ -9,7 +9,7 @@
     top: 22px;
     user-select: none;
     width: 100%;
-    z-index: $z-index-popup;
+    z-index: $z-index-calling;
     padding-inline: 1rem;
   }
 
diff --git a/ts/services/calling.ts b/ts/services/calling.ts
index 1ebdc1e08..8a69b075c 100644
--- a/ts/services/calling.ts
+++ b/ts/services/calling.ts
@@ -1783,6 +1783,8 @@ export class CallingClass {
       await processGroupCallRingCancellation(ringId);
     }
 
+    this.stopCallingLobby();
+
     if (shouldRing) {
       log.info('handleGroupCallRingUpdate: ringing');
       this.reduxInterface?.receiveIncomingGroupCall({
@@ -1886,6 +1888,8 @@ export class CallingClass {
 
       this.attachToCall(conversation, call);
 
+      this.stopCallingLobby();
+
       this.reduxInterface.receiveIncomingDirectCall({
         conversationId: conversation.id,
         isVideoCall: call.isVideoCall,