diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 8268a9dc39..12cad9bcce 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -2288,11 +2288,18 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader,
 		this.search_box = jQuery(document.createElement("div"))
 			.addClass('search')
 			.prependTo(egwIsMobile()?this.nextmatch.div:this.row_div);
-		// searchbox widget
-		this.et2_searchbox = et2_createWidget('searchbox', {id:"search",onchange:function(){
+		
+		// searchbox widget options
+		var searchbox_options = {
+			id:"search",
+			overlay:(typeof settings.searchbox != 'undefined' && typeof settings.searchbox.overlay != 'undefined')?settings.searchbox.overlay:true,
+			onchange:function(){
 				self.nextmatch.applyFilters({search: this.get_value()});
-			}
-		},this);
+			},
+			value:settings.search
+		};
+		// searchbox widget
+		this.et2_searchbox = et2_createWidget('searchbox', searchbox_options,this);
 
 		// Set activeFilters to current value
 		this.nextmatch.activeFilters.search = settings.search;
diff --git a/etemplate/js/et2_widget_textbox.js b/etemplate/js/et2_widget_textbox.js
index 9a7bd997c6..b5177e988a 100644
--- a/etemplate/js/et2_widget_textbox.js
+++ b/etemplate/js/et2_widget_textbox.js
@@ -415,9 +415,16 @@ et2_register_widget(et2_textbox_ro, ["textbox_ro"]);
 var et2_searchbox = et2_textbox.extend(
 {
 	/**
-	 * Ignore all more advanced attributes.
+	 * Advanced attributes
 	 */
-	attributes: {},
+	attributes: {
+		overlay:{
+			name:"Overlay searchbox",
+			type:"boolean",
+			default:true,
+			description:"Define wheter the searchbox overlays while it's open (true) or stay as solid box infront of the search button (false). Default is true."
+		}
+	},
 
 	/**
 	 * Constructor
@@ -439,10 +446,11 @@ var et2_searchbox = et2_textbox.extend(
 	_createWidget:function()
 	{
 		var self = this;
+		if (this.options.overlay) this.flex.addClass('overlay');
 		// search button indicator
 		this.button = et2_createWidget('button',{image:"search","background_image":"1"},this);
 		this.button.onclick= function(){
-			self._show_hide(true);
+			self._show_hide(jQuery(self.flex).hasClass('hide'));
 			self.search.input.focus();
 		};
 		this.div.prepend(this.button.getDOMNode());
@@ -474,8 +482,11 @@ var et2_searchbox = et2_textbox.extend(
 			},
 
 			blur: function(event){
-				self._show_hide(false);
-				if (self._oldValue != self.get_value()) {
+				if (!event.relatedTarget || !jQuery(event.relatedTarget.parentNode).hasClass('et2_searchbox')) 
+				{
+					self._show_hide((!self.options.overlay && self.get_value()));
+				}
+				if (typeof self.oldValue !='undefined' && self._oldValue != self.get_value()) {
 					self.change();
 				}
 			},
@@ -524,10 +535,12 @@ var et2_searchbox = et2_textbox.extend(
 		if (!this.get_value())
 		{
 			jQuery(this.button.getDOMNode()).removeClass('toolbar_toggled');
+			this.button.set_statustext('');
 		}
 		else
 		{
 			jQuery(this.button.getDOMNode()).addClass('toolbar_toggled');
+			this.button.set_statustext(egw.lang('search for ')+this.get_value());
 		}
 	},
 
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 77e5a3ff78..ace6c5a423 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -2316,9 +2316,10 @@ td.avatar {
 	z-index: 500;
 	white-space: nowrap;
 }
-.et2_searchbox input {
+.et2_searchbox .flex.overlay input {
 	position: absolute;
-	/* top: 1px; */
+}
+.et2_searchbox .flex input{
 	height: 18px;
 	width: 100%;
 }
@@ -2331,9 +2332,15 @@ td.avatar {
 	top: 3px;
 }
 .et2_searchbox .flex {
-	width: 150px;
-	position: absolute;
+	width: 200px;
+	position:relative;
 	display: inline-block;
+	padding-right: 7px;
+	float: right;
+}
+.et2_searchbox .flex.overlay {
+	width: 150px;
+    position: absolute;
 }
 .et2_searchbox .hide {
 	display: none !important;