diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ModuleDialog.js b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ModuleDialog.js
index 00535e0c12a..6e39821cdc8 100644
--- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ModuleDialog.js
+++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ModuleDialog.js
@@ -91,10 +91,17 @@ if (typeof dnn.ContentEditorManager === "undefined" || dnn.ContentEditorManager
                 paneName = paneName.toLowerCase();
             }
             $('.dnnSortable[id]').each(function () {
-                var paneId = $(this).attr('id').toLowerCase();
-                if (paneId.length >= paneName.length
-                        && paneId.indexOf(paneName) == (paneId.length - paneName.length)) {
-                    defaultPane = $(this);
+                var $pane = $(this);
+                var paneId = $pane.attr('id').toLowerCase();
+                var thisPaneName;
+                if ($pane.data('name')) {
+                    thisPaneName = $pane.data('name').toLowerCase();
+                } else {
+                    thisPaneName = paneId.replace(/^dnn_/, '').toLowerCase();
+                }
+                
+                if (paneName === paneId || paneName === thisPaneName) {
+                    defaultPane = $pane;
                     return false;
                 }