diff --git a/src/ui/heat_map_options.js b/src/ui/heat_map_options.js
index efc79668e7392cf5ec8ffe4d1a4839246e1cb925..0fa803d77aacee03f92bcd078c98bcee1203fd6b 100644
--- a/src/ui/heat_map_options.js
+++ b/src/ui/heat_map_options.js
@@ -189,23 +189,25 @@ morpheus.HeatMapOptions = function (controller) {
 	function createMetadataField(isColumns) {
 		var options = [];
 		var value = {};
+		_.each(controller.getVisibleTrackNames(isColumns), function (name) {
+			value[name] = true;
+		});
+		_.each(morpheus.MetadataUtil.getMetadataNames(isColumns ? controller
+			.getProject().getFullDataset().getColumnMetadata() : controller
+			.getProject().getFullDataset().getRowMetadata()),
+			function (name) {
+				options.push(name);
+			});
 		var field = {
 			type: 'bootstrap-select',
+			search: options.length > 10,
 			name: isColumns ? 'column_annotations' : 'row_annotations',
 			multiple: true,
 			value: value,
 			options: options,
 			toggle: true
 		};
-		_.each(controller.getVisibleTrackNames(isColumns), function (name) {
-			value[name] = true;
-		});
-		_.each(morpheus.MetadataUtil.getMetadataNames(isColumns ? controller
-		.getProject().getFullDataset().getColumnMetadata() : controller
-		.getProject().getFullDataset().getRowMetadata()),
-			function (name) {
-				options.push(name);
-			});
+
 		return field;
 	}
 
@@ -583,4 +585,4 @@ morpheus.HeatMapOptions = function (controller) {
 			colorSchemeChooser.dispose();
 		}
 	});
-};
\ No newline at end of file
+};