diff --git a/Src/xWorks/LinkListener.cs b/Src/xWorks/LinkListener.cs
index 324dfeab04..f030c36ecb 100644
--- a/Src/xWorks/LinkListener.cs
+++ b/Src/xWorks/LinkListener.cs
@@ -501,8 +501,8 @@ private bool FollowActiveLink(bool suspendLoadingRecord)
 					// Todo JohnT: need to do something special here if we c
 				}
 				// Return false if the link is to a different database
-				var databases = m_lnkActive.PropertyTableEntries.Where(p => p.name == "database");
-				if (databases.FirstOrDefault()?.name != cache.LangProject.ShortName)
+				var databaseName = m_lnkActive.PropertyTableEntries.Where(p => p.name == "database").FirstOrDefault()?.value as string;
+				if (databaseName != "this$" && databaseName != cache.LangProject.ShortName && m_fFollowingLink)
 				{
 					return false;
 				}