diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index bc8772894..3be7228b3 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -61,7 +61,7 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         new CSVWorld::EnumDelegateFactory (sSpecialisations));
 
     mDelegateFactories->add (CSMWorld::ColumnBase::Display_Attribute,
-        new CSVWorld::EnumDelegateFactory (sAttributes));
+        new CSVWorld::EnumDelegateFactory (sAttributes, true));
 }
 
 CSVDoc::ViewManager::~ViewManager()
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 0dd0a1d59..b1e9f7286 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -92,10 +92,13 @@ void CSVWorld::EnumDelegate::paint (QPainter *painter, const QStyleOptionViewIte
 
 CSVWorld::EnumDelegateFactory::EnumDelegateFactory() {}
 
-CSVWorld::EnumDelegateFactory::EnumDelegateFactory (const char **names)
+CSVWorld::EnumDelegateFactory::EnumDelegateFactory (const char **names, bool allowNone)
 {
     assert (names);
 
+    if (allowNone)
+        add (-1, "");
+
     for (int i=0; names[i]; ++i)
         add (i, names[i]);
 }
diff --git a/apps/opencs/view/world/enumdelegate.hpp b/apps/opencs/view/world/enumdelegate.hpp
index 752ed5be7..58f19ff78 100644
--- a/apps/opencs/view/world/enumdelegate.hpp
+++ b/apps/opencs/view/world/enumdelegate.hpp
@@ -47,8 +47,9 @@ namespace CSVWorld
 
             EnumDelegateFactory();
 
-            EnumDelegateFactory (const char **names);
+            EnumDelegateFactory (const char **names, bool allowNone = false);
             ///< \param names Array of char pointer with a 0-pointer as end mark
+            /// \param allowNone Use value of -1 for "none selected" (empty string)
 
             virtual CommandDelegate *makeDelegate (QUndoStack& undoStack, QObject *parent) const;
             ///< The ownership of the returned CommandDelegate is transferred to the caller.
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index b7259db94..b57645f3b 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -127,15 +127,18 @@ void Skill::save(ESMWriter &esm)
     {
         std::ostringstream stream;
 
-        stream << "#";
+        if (index!=-1)
+        {
+            stream << "#";
 
-        if (index<10)
-            stream << "0";
+            if (index<10)
+                stream << "0";
 
-        stream << index;
+            stream << index;
 
-        if (index>=0 && index<Length)
-            stream << sSkillNameIds[index].substr (6);
+            if (index>=0 && index<Length)
+                stream << sSkillNameIds[index].substr (6);
+        }
 
         return stream.str();
     }