diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index 1e48f3a7c50f1548f61a483bea73711a6f9142dd..19e3966f68952e5628934d572d0239d657ca0169 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -84,11 +84,10 @@ Item {
         onHoldImage.visible = visible
     }
 
-    function closePotentialContactPicker() {
+    function closeContextMenuAndRelatedWindows() {
         ContactPickerCreation.closeContactPicker()
-    }
-
-    function closePotentialPluginHandlerPicker() {
+        SelectScreenWindowCreation.destroySelectScreenWindow()
+        ScreenRubberBandCreation.destroyScreenRubberBandWindow()
         PluginHandlerPickerCreation.closePluginHandlerPicker()
     }
 
diff --git a/src/mainview/components/OngoingCallPage.qml b/src/mainview/components/OngoingCallPage.qml
index 76b448747656fccddd684bb06f9652a12d18aeb6..1c9f9547f921bc3fe7a29996191cf47e431f8a25 100644
--- a/src/mainview/components/OngoingCallPage.qml
+++ b/src/mainview/components/OngoingCallPage.qml
@@ -82,7 +82,7 @@ Rectangle {
     }
 
     function closeContextMenuAndRelatedWindows() {
-        callOverlay.closePotentialContactPicker()
+        callOverlay.closeContextMenuAndRelatedWindows()
     }
 
     function handleParticipantsInfo(infos) {