diff --git a/api/logic/FileSystem.cpp b/api/logic/FileSystem.cpp
index 192d868b..58c4ed86 100644
--- a/api/logic/FileSystem.cpp
+++ b/api/logic/FileSystem.cpp
@@ -321,7 +321,7 @@ QString DirNameFromString(QString string, QString inDir)
         }
         else
         {
-            dirName = baseName + QString::number(num);;
+            dirName = baseName + QString::number(num);
         }
 
         // If it's over 9000
diff --git a/api/logic/InstanceList.cpp b/api/logic/InstanceList.cpp
index 2771937c..95eda403 100644
--- a/api/logic/InstanceList.cpp
+++ b/api/logic/InstanceList.cpp
@@ -807,7 +807,12 @@ bool InstanceList::commitStagedInstance(const QString& path, const QString& inst
 {
     QString instID = FS::DirNameFromString(instanceName, m_instDir);
     QString instanceDirName = instID;
-    instanceDirName.truncate(180);
+    if(instanceDirName.length() > 180)
+    {
+        instanceDirName.truncate(176);
+        instanceDirName += instID.at(instID.length() - 4); // In case the last 4 chars were changed
+                                                           // to prevent double folder names
+    }
     {
         WatchLock lock(m_watcher, m_instDir);
         QString destination = FS::PathCombine(m_instDir, instanceDirName);