diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 3412d9598..606a83b99 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -67,7 +67,7 @@ else
                 // pane matches current pane
                 if (Name.ToLower() == pane.ToLower())
                 {
-                    if (module.ModuleId == PageState.ModuleId && PageState.Action != Constants.DefaultAction)
+                    if (PageState.ModuleId == module.ModuleId && PageState.Action != Constants.DefaultAction)
                     {
                         var moduleType = Type.GetType(module.ModuleType);
                         if (moduleType != null)
diff --git a/Oqtane.Shared/Models/Route.cs b/Oqtane.Shared/Models/Route.cs
index 73d648fa4..b5a608f36 100644
--- a/Oqtane.Shared/Models/Route.cs
+++ b/Oqtane.Shared/Models/Route.cs
@@ -49,8 +49,7 @@ public Route(string route, string aliaspath)
             pos = PagePath.IndexOf("/" + Constants.ModuleDelimiter + "/");
             if (pos != -1)
             {
-                ModuleId = PagePath.Substring(pos + 3);
-                ModuleId = (int.TryParse(ModuleId, out _)) ? ModuleId : "-1";
+                ModuleId = PagePath.Substring(pos + 3); 
                 PagePath = PagePath.Substring(0, pos);
             }
             if (ModuleId.Length != 0)