diff --git a/includes/frontend/class-template-handler.php b/includes/frontend/class-template-handler.php
index 7a6c826..f51086a 100644
--- a/includes/frontend/class-template-handler.php
+++ b/includes/frontend/class-template-handler.php
@@ -50,7 +50,8 @@ public function __construct() {
 	public function load_seamless_mode( $query ) {
 		if (
 			$query->get( 'better_search_query' ) ||
-			( wp_is_block_theme() && $query->is_search() )
+			( wp_is_block_theme() && $query->is_search() ) ||
+			( $query->is_search() && bsearch_get_option( 'seamless' ) )
 		) {
 			if ( ! isset( $query->query_vars['is_better_search_loaded'] ) || ! $query->query_vars['is_better_search_loaded'] ) {
 				new \Better_Search_Core_Query( $query->query_vars );