diff --git a/inc/agency/class-opalestate-agency-front.php b/inc/agency/class-opalestate-agency-front.php
index 2b027d7f..16519320 100755
--- a/inc/agency/class-opalestate-agency-front.php
+++ b/inc/agency/class-opalestate-agency-front.php
@@ -308,7 +308,31 @@ class Opalestate_Agency_Front {
 	 *
 	 */
 	public function register_shortcodes() {
+		$this->shortcodes = [
+			'search_agencies'        => [ 'code' => 'search_agencies', 'label' => esc_html__( 'Search Agencies', 'opalestate-pro' ) ],
+		];
 
+		foreach ( $this->shortcodes as $shortcode ) {
+			add_shortcode( 'opalestate_' . $shortcode['code'], [ $this, $shortcode['code'] ] );
+		}
+	}	
+
+	/**
+	 *
+	 */
+	public function search_agencies ( $atts=[] ) {
+		
+		$atts 	 = is_array( $atts ) ? $atts : [];
+		$layout  = 'search-agency-form';
+
+		$default = array(
+			'current_uri' 		=> null,
+			'form'				=> $layout
+		);
+		
+		$atts = array_merge( $default, $atts );
+
+		return opalestate_load_template_path( 'shortcodes/search-agencies' , $atts );
 	}
 
 	/**
diff --git a/templates/shortcodes/search-agencies.php b/templates/shortcodes/search-agencies.php
new file mode 100644
index 00000000..75e3805b
--- /dev/null
+++ b/templates/shortcodes/search-agencies.php
@@ -0,0 +1,4 @@
+<div class="search-agency-form-wrap">
+	<?php echo opalestate_load_template_path( 'parts/'.$form, array('current_uri' => $current_uri ) ); ?>
+</div>
+ 
\ No newline at end of file