diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index a1857f0eb8..d225081fbd 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -3148,8 +3148,19 @@ div.eml div.emlDelete:hover, div.eml div.emlEdit:hover  {
     margin-left: 0;
 }
 #api\.vfsSelectUI_app {width:177px}
-#api\.vfsSelectUI_name {padding-right: 4px;}
-
+#api\.vfsSelectUI_name {
+	padding-right: 0;
+	margin-right:0;
+}
+#api\.vfsSelectUI_search.et2_searchbox .flex{
+	width: 122px;
+	padding-right: 0px;
+}
+#api\.vfsSelectUI_path {width:100%;}
+#api\.vfsSelectUI_path .et2_textbox.et2_vfs {
+	padding-right: 0px;
+	margin-right: 0px;
+}
 tr.disableIfNoEPL {
     box-shadow: inset 1px 1px 1px 1px #b9b9b9bf;
 }
diff --git a/api/templates/default/vfsSelectUI.xet b/api/templates/default/vfsSelectUI.xet
index f201f0d325..2d42c3ed81 100644
--- a/api/templates/default/vfsSelectUI.xet
+++ b/api/templates/default/vfsSelectUI.xet
@@ -19,7 +19,8 @@
 						<select width="175" id="app" empty_label="Applications" no_lang="1" onchange="app.vfsSelectUI.do_action('app', widget)"/>
 						<buttononly statustext="Create directory" id="createdir" class="createDir" onclick="app.vfsSelectUI.createdir" image="button_createdir" ro_image="createdir_disabled" background_image="1"/>
 						<file id='upload_file' statustext="upload file" progress_dropdownlist = "true" multiple="true" onFinish="app.vfsSelectUI.storeFile"/>
-						<vfs-name id="path" class="et2_fullWidth selectPath" align="left" onchange="app.vfsSelectUI.do_action('path', widget)"/>
+						<searchbox id="search"/>
+						<vfs-path id="path" class="et2_fullWidth selectPath" align="left" onchange="app.vfsSelectUI.do_action('path', widget)"/>
 					</box>
 				</row>
 				<row>