diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 0b7b36566c4a035706549c48d901a82daa4366e3..a7f2359da152372925f657e029079fa6c81eae7a 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -64,7 +64,9 @@ public:
                     if (isCheckable(i) && source->isCheckable(j))
                         setChecked(i, source->checked(j));
                     break;
-                } else if (stateFile < sourceStateFile) {
+                } else if (((stateFile.first & UntrackedFile)
+                            == (sourceStateFile.first & UntrackedFile))
+                           && (stateFile < sourceStateFile)) {
                     break;
                 }
             }