diff --git a/Composer/packages/extensions/obiformeditor/demo/src/index.tsx b/Composer/packages/extensions/obiformeditor/demo/src/index.tsx
index 8f097f2474..0b5257ce8c 100644
--- a/Composer/packages/extensions/obiformeditor/demo/src/index.tsx
+++ b/Composer/packages/extensions/obiformeditor/demo/src/index.tsx
@@ -6,10 +6,9 @@ import debounce from 'lodash/debounce';
 import nanoid from 'nanoid';
 import { initializeIcons } from '@uifabric/icons';
 import { ExpressionEngine } from 'botbuilder-expression-parser';
-import { seedNewDialog } from '@bfc/shared';
+import { seedNewDialog, LuFile, DialogInfo, ShellApi } from '@bfc/shared';
 
 import Example from '../../src';
-import { ShellApi, LuFile, DialogInfo } from '../../src/types';
 import { buildDialogOptions } from '../../src/Form/utils';
 
 import editorSchema from './editorschema.json';
@@ -163,6 +162,8 @@ const mockShellApi = [
   'createLgTemplate',
   'updateLgTemplate',
   'validateExpression',
+  'onFocusSteps',
+  'onFocusEvent',
 ].reduce((mock, api) => {
   mock[api] = (...args) =>
     new Promise(resolve => {
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
index 6518e172a8..0c12e8e9fc 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
@@ -51,6 +51,7 @@ export const LgEditorWidget: React.FC<LgEditorWidgetProps> = props => {
   );
 
   const template = (lgFile &&
+    lgFile.templates &&
     lgFile.templates.find(template => {
       return template.Name === lgId;
     })) || {
@@ -68,7 +69,7 @@ export const LgEditorWidget: React.FC<LgEditorWidgetProps> = props => {
 
   // only do this once
   const allContent = useMemo(() => {
-    if (!lgFile) {
+    if (!lgFile || !lgFile.templates) {
       return '';
     }