diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
index 5a76e8a03d..cb5f33ef19 100644
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
@@ -116,6 +116,7 @@ define(function(require) {
     this.totalApps = 0;
 
     this.conf.searchDropdownHTML = SearchDropdown({tableId: this.dataTableId});
+    this.conf.searchByType = true;
     this.searchColumn = SEARCH_COLUMN;
 
     TabDataTable.call(this);
diff --git a/src/sunstone/public/app/utils/tab-datatable.js b/src/sunstone/public/app/utils/tab-datatable.js
index ff3f184be8..4104bca5b7 100644
--- a/src/sunstone/public/app/utils/tab-datatable.js
+++ b/src/sunstone/public/app/utils/tab-datatable.js
@@ -139,7 +139,8 @@ define(function(require) {
 
     that.searchInputHTML = TemplateSearchInputHTML({
       "dataTableSearchId": this.dataTableId + "Search",
-      "searchDropdownHTML": this.conf.searchDropdownHTML
+      "searchDropdownHTML": this.conf.searchDropdownHTML,
+      "searchByType": this.conf.searchByType
     });
 
     return that;
diff --git a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
index 6c3e0d2a8f..b3d843ddb2 100644
--- a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
+++ b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs
@@ -16,6 +16,7 @@
 
 {{#if searchDropdownHTML}}
 <div id="{{dataTableSearchId}}-wrapper" class="input-group" style="display:flex;">
+  {{#if searchByType}}
   <select search-field="TYPE" id="{{dataTableSearchId}}-selectTYPE" class="type-selector">
     <option value="">{{tr "All"}}</option>
     <option value="VMTEMPLATE">{{tr "VM Templates"}}</option>
@@ -23,6 +24,7 @@
     <option value="SERVICE_TEMPLATE">{{tr "Service Templates"}}</option>
   </select>
   &nbsp;
+  {{/if}}
   <input class="input-group-field" id="{{dataTableSearchId}}" name="{{dataTableSearchId}}" autocomplete="off" type="search" placeholder="{{tr "Search"}}" />
   <div class="input-group-button">
     <i class="fas fa-filter search-button" data-toggle="{{dataTableSearchId}}-dropdown"></i>