diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
index c8bd9a29f3..58b3c9d5b9 100644
--- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
@@ -527,7 +527,7 @@ export const ProjectTree: React.FC<Props> = ({
         key={`lg_${item.id}`}
         dialogName={dialog.displayName}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.LG}
+        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
         link={link}
@@ -571,7 +571,7 @@ export const ProjectTree: React.FC<Props> = ({
         key={`lu_${item.id}`}
         dialogName={dialog.displayName}
         extraSpace={INDENT_PER_LEVEL}
-        icon={icons.LU}
+        icon={icons.DIALOG}
         isActive={doesLinkMatch(link, selectedLink)}
         isMenuOpen={isMenuOpen}
         link={link}
diff --git a/Composer/packages/client/src/pages/language-generation/code-editor.tsx b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
index aae80bf07f..dbfd6709ed 100644
--- a/Composer/packages/client/src/pages/language-generation/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
@@ -51,7 +51,7 @@ const CodeEditor: React.FC<CodeEditorProps> = (props) => {
 
   const file: LgFile | undefined = lgFileId
     ? lgFiles.find(({ id }) => id === lgFileId)
-    : lgFiles.find(({ id }) => id === `${dialogId}.${locale}`);
+    : lgFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);
 
   const defaultLangFile = lgFileId
     ? lgFiles.find(({ id }) => id === lgFileId)
diff --git a/Composer/packages/client/src/pages/language-generation/table-view.tsx b/Composer/packages/client/src/pages/language-generation/table-view.tsx
index 18274b064c..9ed2b4e732 100644
--- a/Composer/packages/client/src/pages/language-generation/table-view.tsx
+++ b/Composer/packages/client/src/pages/language-generation/table-view.tsx
@@ -51,7 +51,7 @@ const TableView: React.FC<TableViewProps> = (props) => {
 
   const file = lgFileId
     ? lgFiles.find(({ id }) => id === lgFileId)
-    : lgFiles.find(({ id }) => id === `${dialogId}.${locale}`);
+    : lgFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);
 
   const defaultLangFile = lgFileId
     ? lgFiles.find(({ id }) => id === lgFileId)
diff --git a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
index 2c28246b14..a056e8c01e 100644
--- a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
@@ -45,7 +45,7 @@ const CodeEditor: React.FC<CodeEditorProps> = (props) => {
 
   const file = luFileId
     ? luFiles.find(({ id }) => id === luFileId)
-    : luFiles.find(({ id }) => id === `${dialogId}.${locale}`);
+    : luFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);
 
   const defaultLangFile = luFileId
     ? luFiles.find(({ id }) => id === luFileId)
diff --git a/Composer/packages/client/src/pages/language-understanding/table-view.tsx b/Composer/packages/client/src/pages/language-understanding/table-view.tsx
index a974ba276d..1317f1e7f4 100644
--- a/Composer/packages/client/src/pages/language-understanding/table-view.tsx
+++ b/Composer/packages/client/src/pages/language-understanding/table-view.tsx
@@ -62,7 +62,7 @@ const TableView: React.FC<TableViewProps> = (props) => {
 
   const file = luFileId
     ? luFiles.find(({ id }) => id === luFileId)
-    : luFiles.find(({ id }) => id === `${dialogId}.${locale}`);
+    : luFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);
 
   const defaultLangFile = luFileId
     ? luFiles.find(({ id }) => id === luFileId)
diff --git a/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts b/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts
index fc49a8a07a..d47366fd55 100644
--- a/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts
+++ b/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts
@@ -36,10 +36,11 @@ export const getLanguageFileImports = <T extends LgFile | LuFile | QnAFile>(
       continue;
     }
     const currentImports = file.imports.map((item) => {
+      const importedFile = getFile(getBaseName(item.id));
       return {
         displayName: item.description,
         importPath: item.path,
-        id: getBaseName(item.id),
+        id: importedFile ? importedFile.id : '',
       };
     });
 
@@ -62,7 +63,7 @@ export const lgImportsSelectorFamily = selectorFamily<LanguageFileImport[], { pr
       get(lgFilesSelectorFamily(projectId)).find((f) => f.id === fileId || f.id === `${fileId}.${locale}`) as LgFile;
 
     // Have to exclude common as a special case
-    return getLanguageFileImports(dialogId, getFile).filter((i) => i.id !== 'common');
+    return getLanguageFileImports(dialogId, getFile).filter((i) => getBaseName(i.id) !== 'common');
   },
 });