diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1471d577..39cb4b904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ option(WITH_XC_BROWSER "Include browser integration with keepassxc-browser." OFF
 option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
 option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
 option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
+option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
 if(APPLE)
     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
 endif()
@@ -65,6 +66,10 @@ if(WITH_XC_ALL)
   endif()
 endif()
 
+if(WITH_XC_KEESHARE_SECURE)
+    set(WITH_XC_KEESHARE ON)
+endif()
+
 if(WITH_XC_SSHAGENT OR WITH_XC_KEESHARE)
   set(WITH_XC_CRYPTO_SSH ON)
 else()
@@ -360,16 +365,13 @@ include_directories(SYSTEM ${ARGON2_INCLUDE_DIR})
 # Optional
 if(WITH_XC_KEESHARE)
     # ZLIB is needed and already required
-    find_package(QuaZip QUIET)
-    if(QUAZIP_FOUND)
-        message(STATUS "Found QuaZip - allow KeeShare with secure container\n")
+    if(WITH_XC_KEESHARE_SECURE)
+        find_package(QuaZip REQUIRED)
         set(WITH_XC_KEESHARE_INSECURE ON)
         set(WITH_XC_KEESHARE_SECURE ON)
         include_directories(SYSTEM ${QUAZIP_INCLUDE_DIR})
     else()
-        message(STATUS "No QuaZip - restrict KeeShare to insecure container\n")
         set(WITH_XC_KEESHARE_INSECURE ON)
-        set(WITH_XC_KEESHARE_SECURE OFF)
     endif()
 else()
     set(WITH_XC_KEESHARE_INSECURE OFF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0313d4e9..355748a94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -202,7 +202,7 @@ add_feature_info(Auto-Type WITH_XC_AUTOTYPE "Automatic password typing")
 add_feature_info(Networking WITH_XC_NETWORKING "Compile KeePassXC with network access code (e.g. for downloading website icons)")
 add_feature_info(KeePassXC-Browser WITH_XC_BROWSER "Browser integration with KeePassXC-Browser")
 add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible with KeeAgent")
-add_feature_info(KeeShare-Insecure WITH_XC_KEESHARE_INSECURE "Sharing integration with KeeShare restricted to insecure sources")
+add_feature_info(KeeSharee WITH_XC_KEESHARE "Sharing integration with KeeShare")
 add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
 add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
 if(APPLE)
diff --git a/src/keeshare/group/EditGroupWidgetKeeShare.cpp b/src/keeshare/group/EditGroupWidgetKeeShare.cpp
index 492e05c76..63f4182af 100644
--- a/src/keeshare/group/EditGroupWidgetKeeShare.cpp
+++ b/src/keeshare/group/EditGroupWidgetKeeShare.cpp
@@ -44,6 +44,8 @@ EditGroupWidgetKeeShare::EditGroupWidgetKeeShare(QWidget* parent)
     m_ui->passwordGenerator->reset();
 
     m_ui->messageWidget->hide();
+    m_ui->messageWidget->setCloseButtonVisible(false);
+    m_ui->messageWidget->setAutoHideTimeout(-1);
 
     connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), m_ui->passwordEdit, SLOT(setShowPassword(bool)));
     connect(m_ui->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool)));