diff --git a/js/iD/tags/PresetList.js b/js/iD/tags/PresetList.js
index 7a121fac5..e3b0ad87c 100644
--- a/js/iD/tags/PresetList.js
+++ b/js/iD/tags/PresetList.js
@@ -28,11 +28,13 @@ declare("iD.tags.PresetList", null, {
 	assembleEditorsForEntity:function(_entity) {
 		if (_entity.entityType!=this.entityType) return false;
 		
+		var presetList={};
 		var editorList=[];
 		for (var group in this.presets) {
 			for (var preset in this.presets[group]) {
 				var props=this.presets[group][preset];
 				if (_entity.matchesTags(props.tags)) {
+					presetList[preset]=props;
 					for (var i in props.editors) {
 						var editor=props.editors[i];
 						if (editorList.indexOf(editor)==-1) { editorList.push(editor); }
@@ -40,7 +42,7 @@ declare("iD.tags.PresetList", null, {
 				}
 			}
 		}
-		return editorList;
+		return { presets:presetList, editors: editorList };
 	}
 
 });
diff --git a/js/iD/tags/TagEditor.js b/js/iD/tags/TagEditor.js
index 3e078fe9a..24b7ad5bd 100644
--- a/js/iD/tags/TagEditor.js
+++ b/js/iD/tags/TagEditor.js
@@ -19,7 +19,6 @@ declare("iD.tags.TagEditor", null, {
 		this.editorContainers={};
 
 		// Create the dialog, and the form to put the editors in
-
 		this.dialog = new dijit.Dialog({ title: "My Dialog", content: "Test content.", style: "width: 300px" });
 		var form = new dijit.form.Form({ encType: 'multipart/form-data', action: '', method: '',
 			onSubmit: function(event) { console.log('submit'); }
@@ -27,14 +26,33 @@ declare("iD.tags.TagEditor", null, {
 		this.dialog.set('content',form);
 		this.dialog.show();
 
-		// Add each editor
+		// What editors are relevant?
 		var presetList=this.controller.presets[_entity.entityType];
-		var editors=presetList.assembleEditorsForEntity(_entity);
-		for (var i in editors) {
-			var editor=editors[i];
-			this.appendEditor(editor,form.domNode);
+		var applicablePresets=presetList.assembleEditorsForEntity(_entity);
+
+		// Add preset types
+		for (var i in applicablePresets.presets) {
+			this.appendPreset(i,applicablePresets.presets[i],form.domNode);
+		}
+
+		// Add each editor
+		for (var i in applicablePresets.editors) {
+			this.appendEditor(applicablePresets.editors[i],form.domNode);
 		}
 	},
+
+	// ------------
+	// Presets
+
+	appendPreset:function(_name,_preset,_destination) {
+		var element=domConstruct.create('h2');
+		element.appendChild(domConstruct.create('img', { src: 'presets/'+_preset.icon }));
+		element.appendChild(dojo.doc.createTextNode(_name));
+		_destination.appendChild(element);
+	},
+
+	// ------------
+	// Editors
 	
 	appendEditor:function(_editor,_destination) {
 		// summary:		Request an editor (cached if available, XHR if not), and call renderEditor when it's available.