diff --git a/src/repository.c b/src/repository.c
index fec476396..18c6eed76 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -763,6 +763,13 @@ static int repo_is_worktree(unsigned *out, const git_repository *repo)
 	git_buf gitdir_link = GIT_BUF_INIT;
 	int error;
 
+	/* Worktrees cannot have the same commondir and gitdir */
+	if (repo->commondir && repo->gitdir
+	    && !strcmp(repo->commondir, repo->gitdir)) {
+		*out = 0;
+		return 0;
+	}
+
 	if ((error = git_buf_joinpath(&gitdir_link, repo->gitdir, "gitdir")) < 0)
 		return -1;
 
diff --git a/tests/submodule/open.c b/tests/submodule/open.c
index 3676f22be..0ef01ec24 100644
--- a/tests/submodule/open.c
+++ b/tests/submodule/open.c
@@ -69,3 +69,22 @@ void test_submodule_open__direct_open_succeeds(void)
 
 	git_buf_free(&path);
 }
+
+void test_submodule_open__direct_open_succeeds_for_broken_sm_with_gitdir(void)
+{
+	git_buf path = GIT_BUF_INIT;
+
+	/*
+	 * This is actually not a valid submodule, but we
+	 * encountered at least one occasion where the gitdir
+	 * file existed inside of a submodule's gitdir. As we are
+	 * now able to open these submodules correctly, we still
+	 * add a test for this.
+	 */
+	cl_git_mkfile("submod2/.git/modules/sm_unchanged/gitdir", ".git");
+	cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_parent), "sm_unchanged"));
+	cl_git_pass(git_repository_open(&g_child, path.ptr));
+	assert_sm_valid(g_parent, g_child, "sm_unchanged");
+
+	git_buf_free(&path);
+}