diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js
index 1808802350..17530cd05d 100644
--- a/public/src/modules/iconSelect.js
+++ b/public/src/modules/iconSelect.js
@@ -48,11 +48,16 @@ define('iconSelect', ['benchpress'], function (Benchpress) {
 							var iconClass = $('.bootbox .selected').attr('class');
 							var categoryIconClass = $('<div></div>').addClass(iconClass).removeClass('fa').removeClass('selected')
 								.attr('class');
+							var searchElVal = picker.find('input').val();
 
 							if (categoryIconClass) {
 								el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass);
 								el.val(categoryIconClass);
 								el.attr('value', categoryIconClass);
+							} else if (searchElVal) {
+								el.attr('class', searchElVal);
+								el.val(searchElVal);
+								el.attr('value', searchElVal);
 							}
 
 							onModified(el);