diff --git a/pandora/event/models.py b/pandora/event/models.py
index 01df8736..29b58ea5 100644
--- a/pandora/event/models.py
+++ b/pandora/event/models.py
@@ -29,7 +29,7 @@ class Event(models.Model):
     user = models.ForeignKey(User, null=True, related_name='events')
 
     name = models.CharField(null=True, max_length=255, unique=True)
-    name_sort = models.CharField(null=True, max_length=255, unique=True)
+    name_sort = models.CharField(null=True, max_length=255, db_index=True)
     name_find = models.TextField(default='', editable=True)
     wikipediaId = models.CharField(max_length=1000, blank=True)
 
diff --git a/pandora/event/views.py b/pandora/event/views.py
index 49dc7ae4..e0f28b8d 100644
--- a/pandora/event/views.py
+++ b/pandora/event/views.py
@@ -76,6 +76,8 @@ def editEvent(request):
                 conflict = True
                 conflict_names.append(name)
         if not conflict:
+            if 'name' in data and event.name_sort == unicodedata.normalize('NFKD', event.name):
+                event.name_sort = unicodedata.normalize('NFKD', data['name'])
             for key in ('name', 'start', 'startTime', 'end', 'endTime', 'duration', 'durationTime',
                         'type', 'alternativeNames'):
                 if key in data: