From a6fbb9825247faa2b93bf9019fb6fe9bc568891f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:02:32 +0100
Subject: [PATCH] only show close button when not in a dialog, which already
 has one

---
 src/components/views/right_panel/EncryptionPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index e67af0805a..2c51662111 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -91,7 +91,7 @@ const EncryptionPanel = (props) => {
     }, [request]);
 
     let cancelButton;
-    if (request && request.pending) {
+    if (layout !== "dialog" && request && request.pending) {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         cancelButton = (<AccessibleButton
             className="mx_EncryptionPanel_cancel"