diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 0d274474c..f5bc2369a 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -239,7 +239,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
         return false;
 
     EsmFile *file = item(index.row());
-    QString fileName = file->filePath();
+    QString fileName = file->fileName();
     bool success = false;
 
     switch(role)
@@ -266,7 +266,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
 
             if (success)
             {
-                success = setCheckState(fileName, value.toBool());
+                success = setCheckState(file->filePath(), value.toBool());
                 emit dataChanged(index, index);
             }
         }
@@ -277,19 +277,19 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
             int checkValue = value.toInt();
             bool success = false;
             bool setState = false;
-            if ((checkValue==Qt::Checked) && !isChecked(fileName))
+            if ((checkValue==Qt::Checked) && !isChecked(file->filePath()))
             {
                 setState = true;
                 success = true;
             }
-            else if ((checkValue == Qt::Checked) && isChecked (fileName))
+            else if ((checkValue == Qt::Checked) && isChecked (file->filePath()))
                 setState = true;
             else if (checkValue == Qt::Unchecked)
                 setState = true;
 
             if (setState)
             {
-                setCheckState(fileName, success);
+                setCheckState(file->filePath(), success);
                 emit dataChanged(index, index);
 
             }
@@ -517,10 +517,10 @@ void ContentSelectorModel::ContentModel::sortFiles()
     }
 }
 
-bool ContentSelectorModel::ContentModel::isChecked(const QString& name) const
+bool ContentSelectorModel::ContentModel::isChecked(const QString& filepath) const
 {
-    if (mCheckStates.contains(name))
-        return (mCheckStates[name] == Qt::Checked);
+    if (mCheckStates.contains(filepath))
+        return (mCheckStates[filepath] == Qt::Checked);
 
     return false;
 }
@@ -543,12 +543,12 @@ void ContentSelectorModel::ContentModel::refreshModel()
     emit dataChanged (index(0,0), index(rowCount()-1,0));
 }
 
-bool ContentSelectorModel::ContentModel::setCheckState(const QString &name, bool checkState)
+bool ContentSelectorModel::ContentModel::setCheckState(const QString &filepath, bool checkState)
 {
-    if (name.isEmpty())
+    if (filepath.isEmpty())
         return false;
 
-    const EsmFile *file = item(name);
+    const EsmFile *file = item(filepath);
 
     if (!file)
         return false;
@@ -558,8 +558,8 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString &name, bool
     if (checkState)
         state = Qt::Checked;
 
-    mCheckStates[name] = state;
-    emit dataChanged(indexFromItem(item(name)), indexFromItem(item(name)));
+    mCheckStates[filepath] = state;
+    emit dataChanged(indexFromItem(item(filepath)), indexFromItem(item(filepath)));
 
     if (file->isGameFile())
         refreshModel();
@@ -586,7 +586,10 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString &name, bool
     {
         foreach (const EsmFile *downstreamFile, mFiles)
         {
-            if (downstreamFile->gameFiles().contains(name))
+            QFileInfo fileInfo(filepath);
+            QString filename = fileInfo.fileName();
+
+            if (downstreamFile->gameFiles().contains(filename))
             {
                 if (mCheckStates.contains(downstreamFile->filePath()))
                     mCheckStates[downstreamFile->filePath()] = Qt::Unchecked;
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 8c8c2124b..6d147bce9 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -45,8 +45,8 @@ namespace ContentSelectorModel
         const EsmFile *item(const QString &name) const;
 
         bool isEnabled (QModelIndex index) const;
-        bool isChecked(const QString &name) const;
-        bool setCheckState(const QString &name, bool isChecked);
+        bool isChecked(const QString &filepath) const;
+        bool setCheckState(const QString &filepath, bool isChecked);
         void setCheckStates (const QStringList &fileList, bool isChecked);
         ContentFileList checkedItems() const;
         void uncheckAll();
diff --git a/components/contentselector/model/esmfile.hpp b/components/contentselector/model/esmfile.hpp
index ca24b52d1..7e1edcaba 100644
--- a/components/contentselector/model/esmfile.hpp
+++ b/components/contentselector/model/esmfile.hpp
@@ -53,6 +53,8 @@ namespace ContentSelectorModel
         inline QDateTime modified() const           { return mModified; }
         inline float format() const                 { return mFormat; }
         inline QString filePath() const                 { return mPath; }
+
+        /// @note Contains file names, not paths.
         inline const QStringList &gameFiles() const { return mGameFiles; }
         inline QString description() const          { return mDescription; }
         inline QString toolTip() const              { return sToolTip.arg(mAuthor)