diff --git a/WebApp/WebContent/data_file/file_list.xhtml b/WebApp/WebContent/data_file/file_list.xhtml
index 493ca404c..2a6fe1a11 100644
--- a/WebApp/WebContent/data_file/file_list.xhtml
+++ b/WebApp/WebContent/data_file/file_list.xhtml
@@ -18,7 +18,7 @@
         <h:panelGrid columns="3" cellpadding="5" class="buttonPanel contentList">
           <p:outputLabel for="instrumentAdmin" value="Select Instrument:" />
           <ui:fragment rendered="#{User.adminUser}">
-            <p:selectOneMenu id="instrumentAdmin"
+            <p:selectOneMenu id="instrumentAdmin" filter="true" filterMatchMode="contains"
               value="#{dataFilesBean.currentInstrumentId}">
                 <f:selectItems value="#{dataFilesBean.instruments}" var="instrument"
                   itemValue="#{instrument.id}"
@@ -27,7 +27,7 @@
             </p:selectOneMenu>
           </ui:fragment>
           <ui:fragment rendered="#{not User.adminUser}">
-            <p:selectOneMenu id="instrumentNonAdmin"
+            <p:selectOneMenu id="instrumentNonAdmin" filter="true" filterMatchMode="contains"
               value="#{dataFilesBean.currentInstrumentId}">
                 <f:selectItems value="#{dataFilesBean.instruments}" var="instrument"
                   itemValue="#{instrument.id}"
diff --git a/WebApp/WebContent/dataset/dataset_list.xhtml b/WebApp/WebContent/dataset/dataset_list.xhtml
index 0e223f2aa..fa17f6359 100644
--- a/WebApp/WebContent/dataset/dataset_list.xhtml
+++ b/WebApp/WebContent/dataset/dataset_list.xhtml
@@ -179,7 +179,7 @@
         <h:panelGrid columns="3" cellpadding="5" class="buttonPanel contentList">
           <p:outputLabel for="instrumentAdmin" value="Select Instrument:" />
           <ui:fragment rendered="#{User.adminUser}">
-            <p:selectOneMenu id="instrumentAdmin"
+            <p:selectOneMenu id="instrumentAdmin" filter="true" filterMatchMode="contains"
               value="#{dataSetsBean.currentInstrumentId}" onchange="updateList()">
                 <f:selectItems value="#{dataSetsBean.instruments}" var="instrument"
                   itemValue="#{instrument.id}"
@@ -188,7 +188,7 @@
             </p:selectOneMenu>
           </ui:fragment>
           <ui:fragment rendered="#{not User.adminUser}">
-            <p:selectOneMenu id="instrumentNonAdmin"
+            <p:selectOneMenu id="instrumentNonAdmin" filter="true" filterMatchMode="contains"
               value="#{dataSetsBean.currentInstrumentId}" onchange="updateList()">
                 <f:selectItems value="#{dataSetsBean.instruments}" var="instrument"
                   itemValue="#{instrument.id}"