diff --git a/integrations/nextcloud/snappymail/js/snappymail.js b/integrations/nextcloud/snappymail/js/snappymail.js
index 38a915ab7..fcbd88da3 100644
--- a/integrations/nextcloud/snappymail/js/snappymail.js
+++ b/integrations/nextcloud/snappymail/js/snappymail.js
@@ -141,3 +141,10 @@ function SnappyMailFormHelper(oForm)
 		console.error(e);
 	}
 }
+
+addEventListener('hashchange', (event) => {
+	const search = event.newURL.substring(event.newURL.lastIndexOf('/') + 1);
+	if (search && search.length < 25) {
+		document.getElementById('rliframe').contentWindow.rl.app.messageList.mainSearch(search);
+	}
+});
diff --git a/integrations/nextcloud/snappymail/lib/Search/Provider.php b/integrations/nextcloud/snappymail/lib/Search/Provider.php
index 7b9b63157..f0eccbf79 100644
--- a/integrations/nextcloud/snappymail/lib/Search/Provider.php
+++ b/integrations/nextcloud/snappymail/lib/Search/Provider.php
@@ -91,12 +91,12 @@ class Provider implements IProvider
 			$MessageCollection = $oMailClient->MessageList($oParams);
 
 			$baseURL = $this->urlGenerator->linkToRoute('snappymail.page.index');
-			$config = \OC::$server->getConfig();
-			if ($config->getAppValue('snappymail', 'snappymail-no-embed')) {
-				$baseURL .= '?target=';
-			} else {
+//			$config = \OC::$server->getConfig();
+//			if ($config->getAppValue('snappymail', 'snappymail-no-embed')) {
+//				$baseURL .= '?target=';
+//			} else {
 				$baseURL .= '#';
-			}
+//			}
 			$search = \rawurlencode($oParams->sSearch);
 
 //			$MessageCollection->totalEmails;