diff --git a/.idea/dictionaries/vabene1111.xml b/.idea/dictionaries/vabene1111.xml
index a0d84d941..aff56db5f 100644
--- a/.idea/dictionaries/vabene1111.xml
+++ b/.idea/dictionaries/vabene1111.xml
@@ -2,6 +2,7 @@
   <dictionary name="vabene1111">
     <words>
       <w>dropbox</w>
+      <w>emoji</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file
diff --git a/cookbook/forms.py b/cookbook/forms.py
index ee7a1c5b1..ebd7f017a 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -1,6 +1,17 @@
 from django.utils.translation import gettext as _
 from django import forms
 from .models import *
+from django.forms import widgets, TextInput, DateField
+
+
+class MultiSelectWidget(widgets.SelectMultiple):
+    class Media:
+        js = ('custom/js/from_multiselect.js',)
+
+
+class EmojiWidget(forms.TextInput):
+    class Media:
+        js = 'custom/js/form_emoji.js'
 
 
 class EditRecipeForm(forms.ModelForm):
@@ -16,6 +27,15 @@ class EditRecipeForm(forms.ModelForm):
         }
 
 
+class EditCategoryForm(forms.ModelForm):
+    class Media:
+        js = ('custom/js/form_emoji.js',)
+
+    class Meta:
+        model = Category
+        fields = ('name', 'icon', 'description')
+
+
 class MonitorForm(forms.Form):
     path = forms.CharField(label=_('Path'))
 
diff --git a/cookbook/static/custom/js/form_emoji.js b/cookbook/static/custom/js/form_emoji.js
new file mode 100644
index 000000000..0f56171ed
--- /dev/null
+++ b/cookbook/static/custom/js/form_emoji.js
@@ -0,0 +1,3 @@
+$(document).ready(function () {
+    $('#id_icon').emojioneArea();
+});
\ No newline at end of file
diff --git a/cookbook/static/custom/js/form_multiselect.js b/cookbook/static/custom/js/form_multiselect.js
new file mode 100644
index 000000000..0de439074
--- /dev/null
+++ b/cookbook/static/custom/js/form_multiselect.js
@@ -0,0 +1,3 @@
+$(document).ready(function () {
+    $('#id_keywords').select2();
+});
\ No newline at end of file
diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 0e6bf55c1..8e5944add 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -26,6 +26,9 @@
     <link rel="stylesheet" href="{% static "emojionearea/emojionearea.min.css" %}">
     <script type="text/javascript" src="{% static "emojionearea/emojionearea.min.js" %}"></script>
 
+    {% block extra_head %} <!-- block for templates to put stuff into header -->
+    {% endblock %}
+
     <style>
         @media (max-width: 1025px) {
             .container {
diff --git a/cookbook/templates/generic/edit_template.html b/cookbook/templates/generic/edit_template.html
index 7f84a0b09..79115abec 100644
--- a/cookbook/templates/generic/edit_template.html
+++ b/cookbook/templates/generic/edit_template.html
@@ -4,6 +4,10 @@
 
 {% block title %}{% trans 'Edit' %} - {{ title }}{% endblock %}
 
+{% block extra_head %}
+    {{ form.media }}
+{% endblock %}
+
 {% block content %}
 
     <h3>{% trans 'Edit' %} {{ title }}</h3>
@@ -14,14 +18,4 @@
         <input type="submit" value="Submit" class="btn btn-success">
     </form>
 
-
-    <script>
-        //TODO clean this up
-        //converts multiselct in recipe edit to searchable multiselect
-        //shitty solution that needs to be redone at some point
-        $(document).ready(function () {
-            $('#id_keywords').select2();
-            $('#id_icon').emojioneArea();
-        });
-    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index 78ba22ce8..88f2092b8 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -4,7 +4,7 @@ from django.urls import reverse_lazy, reverse
 from django.utils.translation import gettext as _
 from django.views.generic import UpdateView, DeleteView
 
-from cookbook.forms import EditRecipeForm
+from cookbook.forms import EditRecipeForm, EditCategoryForm
 from cookbook.models import Recipe, Category, Sync, Keyword, RecipeImport
 
 
@@ -27,7 +27,7 @@ class MonitorUpdate(LoginRequiredMixin, UpdateView):
 class CategoryUpdate(LoginRequiredMixin, UpdateView):
     template_name = "generic\edit_template.html"
     model = Category
-    fields = ['name', 'icon', 'description']
+    form_class = EditCategoryForm
 
     # TODO add msg box