diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/WsPortletResources.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/WsPortletResources.java
index 2e24d0a..228f7d9 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/WsPortletResources.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/WsPortletResources.java
@@ -23,6 +23,9 @@ public interface WsPortletResources extends ClientBundle {
 	@Source("shareablelinks-howto.txt")
 	TextResource publicLinkHowTo();
 	
+	@Source("search-howto.txt")
+	TextResource searchHowTo();
+	
 //	@Source("sharelink-howto.txt")
 //	TextResource shareLinkkHowTo();
 }
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/search-howto.txt b/src/main/java/org/gcube/portlets/user/workspace/client/resources/search-howto.txt
new file mode 100644
index 0000000..16f0df3
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/search-howto.txt
@@ -0,0 +1,10 @@
+<div style='text-align:justify'>
+You can use the search facility typing a 'text' to search for name (files and folders) saved in the Workspace.
+As advanced option, you can type the wildcard % (percent sign) that matches zero or more characters (except white space):
+<ul>
+<li>used at the end of a root word (as suffix)</li>
+You are able to search for any text ending of a root word. For example: searching for data% the results will include dataminer, datasets, etc.
+<li>used at the start of a root word (as prefix)</li>
+You are able to search for any text starting of a root word. For example: searching for %data the results will include mydata, personaldata, etc.
+</ul>
+</div>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java
index 5d10817..93e8dcb 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java
@@ -58,7 +58,7 @@ public class WorkspaceFeaturesView extends Composite {
 
 	@UiField Label shf; //Share Folders & Files
 
-	private Popover overShF= new Popover();
+	private Popover overShF = new Popover();
 
 	@UiField Label upl; //UPLOAD
 
@@ -68,14 +68,15 @@ public class WorkspaceFeaturesView extends Composite {
 
 	private Popover overPlk = new Popover();
 
-//	@UiField Label flk; //FOLDER PUBLIC LINK
-	
-//	private Popover overFolderlk = new Popover();
 
 	@UiField Label versioning; //VERSIONING
 	
 	private Popover overversioninglk = new Popover();
 	
+	@UiField Label srh; //search
+	
+	private Popover overSearch = new Popover();
+	
 	
 	@UiField
 	FlowPanel fp1;
@@ -134,11 +135,13 @@ public class WorkspaceFeaturesView extends Composite {
 //		ck_features_show_again.getElement().getFirstChildElement().setId("check_features_donotshowagain");
 
 		ck_features_show_again.addStyleName("margin-right-10");
+		srh.addStyleName("margin-right-10");
 		shf.addStyleName("margin-right-10");
 		upl.addStyleName("margin-right-10");
 //		flk.addStyleName("margin-right-10");
 		plk.addStyleName("margin-right-10");
 		initPopupShareFeature();
+		initPopupSearchFeature();
 //		initPopupFlkFeature();
 		initPopupUploadFeature();
 		initPopupPlkFeature();
@@ -169,6 +172,8 @@ public class WorkspaceFeaturesView extends Composite {
 		});
 	}
 
+
+
 	/**
 	 *Inits the popup versioning feature.
 	 */
@@ -215,6 +220,19 @@ public class WorkspaceFeaturesView extends Composite {
 		overShF.setTrigger(Trigger.HOVER);
 		overShF.reconfigure();
 	}
+	
+	private void initPopupSearchFeature() {
+		overSearch.setAnimation(true);
+		overSearch.setWidget(srh);
+		String icon = "<span style=\"margin-right:5px\">"+Resources.getIconSearchWs().getSafeHtml().asString()+"</span>";
+		overSearch.setHeading(icon+"Search into Workspace");
+		overSearch.setText(WsPortletResources.INSTANCE.searchHowTo().getText());
+		overSearch.setHtml(true);
+		overSearch.setPlacement(Placement.BOTTOM);
+		overSearch.setTrigger(Trigger.HOVER);
+		overSearch.reconfigure();
+		
+	}
 
 	/**
 	 * Inits the popup upload feature.
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml
index e8e7b02..6743986 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml
@@ -27,7 +27,7 @@
 				<g:FlowPanel ui:field="fp2">
 					<g:HorizontalPanel ui:field="ws_features"
 						verticalAlignment="middle">
-
+						<b:Label ui:field="srh" text="Search"></b:Label>
 						<b:Label ui:field="shf" text="Share"></b:Label>
 <!-- 						<b:Label ui:field="flk" text="Share Link"></b:Label> -->
 						<b:Label ui:field="plk" text="Shareable Links"></b:Label>