diff --git a/frontend/src/components/CallUI.vue b/frontend/src/components/CallUI.vue
index 6cc977ce..fca62361 100644
--- a/frontend/src/components/CallUI.vue
+++ b/frontend/src/components/CallUI.vue
@@ -373,17 +373,23 @@ async function makeOutgoingCall(close) {
 }
 
 function cancelCall() {
+  _call.value.disconnect()
   showCallPopup.value = false
-  showSmallCallWindow.value = false
+  if (showSmallCallWindow.value) {
+    showSmallCallWindow.value = false
+  }
   calling.value = false
   onCall.value = false
   callStatus.value = ''
-  _call.value.disconnect()
 }
 
 function toggleCallWindow() {
   showCallPopup.value = !showCallPopup.value
-  showSmallCallWindow.value = !showSmallCallWindow.value
+  if (showCallPopup.value) {
+    showSmallCallWindow.value = false
+  } else {
+    showSmallCallWindow.value = true
+  }
 }
 
 onMounted(() => startupClient())