--- a/+mpm/MatlabPathManager.m	Tue Sep 18 13:03:53 2018 +0200
+++ b/+mpm/MatlabPathManager.m	Tue Sep 18 13:18:02 2018 +0200
@@ -98,27 +98,12 @@
             sp = obj.projectSubpaths(projectFolder);
 
             for i = 1:length(sp)
-                if ~isAtTop(sp{i}, fullfile(projectFolder, sp{i}), mpath)
+                if ~subpathIsActive(fullfile(projectFolder,sp{i}), mpath)
                     b = false;
                     return;
                 end
             end
             b = true;
-
-            function b = isAtTop(subpath, fullsubpath, paths)
-                for i = 1:length(paths)
-                    if ~endsWith(paths{i}, subpath)
-                        continue
-                    end
-
-                    b = strcmp(fullsubpath, paths{i});
-                    return
-                end
-
-                b = false;
-            end
-
-            % TODO: Refactor this into several methods?
         end
 
         % Unload all loaded subpaths. The matlab path should be returned to it's original state
@@ -132,6 +117,23 @@
     end
 end
 
+% Test if the path p is active among folders in path with the same final foldername
+function b = subpathIsActive(p, paths)
+    pathparts = split(p, filesep);
+    foldername = pathparts{end};
+
+    for i = 1:length(paths)
+        if ~endsWith(paths{i}, foldername)
+            % Ignore files with different end foldername
+            continue
+        end
+
+        b = strcmp(p, paths{i});
+        return
+    end
+
+    b = false;
+end
+
 % TODO: Organize order of methods
 % TODO: Add flag for being persistent or not? (savepath or not)
-% TODO: Make is at top a method?
\ No newline at end of file