diff --git a/.vscode/launch.json b/.vscode/launch.json
index befc41ee8b..d787ea102b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -91,8 +91,7 @@
         "NODE_ENV": "development",
         "DEBUG": "composer*",
         "COMPOSER_DEV_TOOLS": "true",
-        "COMPOSER_ENABLE_ONEAUTH": "true",
-        "COMPOSER_PVA_TOPICS": "true"
+        "COMPOSER_ENABLE_ONEAUTH": "true"
       },
       "outputCapture": "std",
       "preLaunchTask": "electron: build",
diff --git a/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx b/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
index 0a7fe750dc..c2c4b26236 100644
--- a/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TopicsList.tsx
@@ -21,7 +21,7 @@ type TopicsListProps = {
 };
 
 export const TopicsList: React.FC<TopicsListProps> = ({ topics, onToggle, textWidth, projectId }) => {
-  const linkTooltip = formatMessage('Open in Power Virtual Agents');
+  const linkTooltip = formatMessage('Edit in Power Virtual Agents');
 
   const renderTopic = (topic: DialogInfo) => {
     const isSystemTopic = get(topic.content, 'isSystemTopic', false);
diff --git a/Composer/packages/server/src/externalContentProvider/__tests__/powerVirtualAgentsProvider.test.ts b/Composer/packages/server/src/externalContentProvider/__tests__/powerVirtualAgentsProvider.test.ts
index 0f9f057972..4022b6bc7a 100644
--- a/Composer/packages/server/src/externalContentProvider/__tests__/powerVirtualAgentsProvider.test.ts
+++ b/Composer/packages/server/src/externalContentProvider/__tests__/powerVirtualAgentsProvider.test.ts
@@ -78,59 +78,12 @@ describe('Power Virtual Agents provider', () => {
     mockFetch.mockResolvedValueOnce(mockResult);
     const result = await provider.downloadBotContent();
 
+    expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('?includeTopics'), expect.any(Object));
     expect(result.eTag).toBe('W/"Version"');
     expect((result.zipPath as string).includes('bot-assets-'));
     expect(Buffer.from(result.urlSuffix, 'base64').toString()).toBe('dialogs/myDialog');
   });
 
-  it('should not include topics by default', async () => {
-    process.env.COMPOSER_PVA_TOPICS = 'any-value-other-than-true';
-    const mockResult = {
-      body: {
-        pipe: jest.fn(),
-      },
-      headers: {
-        get: (header) => {
-          if (header === 'content-type') {
-            return 'application/zip';
-          }
-          if (header === 'etag') {
-            return 'W/"Version"';
-          }
-        },
-      },
-    };
-    mockFetch.mockResolvedValueOnce(mockResult);
-    await provider.downloadBotContent();
-
-    expect(mockFetch).not.toHaveBeenCalledWith(expect.stringContaining('?includeTopics'), expect.any(Object));
-    delete process.env.COMPOSER_PVA_TOPICS;
-  });
-
-  it('should include topics if env variable is set', async () => {
-    process.env.COMPOSER_PVA_TOPICS = 'true';
-    const mockResult = {
-      body: {
-        pipe: jest.fn(),
-      },
-      headers: {
-        get: (header) => {
-          if (header === 'content-type') {
-            return 'application/zip';
-          }
-          if (header === 'etag') {
-            return 'W/"Version"';
-          }
-        },
-      },
-    };
-    mockFetch.mockResolvedValueOnce(mockResult);
-    await provider.downloadBotContent();
-
-    expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('?includeTopics'), expect.any(Object));
-    delete process.env.COMPOSER_PVA_TOPICS;
-  });
-
   it('should throw if the zip response does not have the correct header', async () => {
     const mockResult = {
       body: undefined,
diff --git a/Composer/packages/server/src/externalContentProvider/powerVirtualAgentsProvider.ts b/Composer/packages/server/src/externalContentProvider/powerVirtualAgentsProvider.ts
index 2f16eddd3a..3a54bc835a 100644
--- a/Composer/packages/server/src/externalContentProvider/powerVirtualAgentsProvider.ts
+++ b/Composer/packages/server/src/externalContentProvider/powerVirtualAgentsProvider.ts
@@ -160,8 +160,7 @@ export class PowerVirtualAgentsProvider extends ExternalContentProvider<PowerVir
 
   private getContentUrl(): string {
     const { envId, baseUrl, botId } = this.metadata;
-    const query = process.env.COMPOSER_PVA_TOPICS === 'true' ? '?includeTopics=true' : '';
-    return `${baseUrl || getBaseUrl()}/environments/${envId}/bots/${botId}/composer/content${query}`;
+    return `${baseUrl || getBaseUrl()}/environments/${envId}/bots/${botId}/composer/content?includeTopics=true`;
   }
 
   private async getRequestHeaders() {
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
index 23be6c8374..2f6d6fc108 100644
--- a/Composer/packages/server/src/models/bot/botProject.ts
+++ b/Composer/packages/server/src/models/bot/botProject.ts
@@ -822,6 +822,7 @@ export class BotProject implements IBotProject {
     const paths = this.fileStorage.globSync(
       [
         ...BotStructureFilesPatterns,
+        ...PVATopicFilePatterns,
         '!(generated/**)',
         '!(runtime/**)',
         '!(bin/**)',
@@ -829,7 +830,7 @@ export class BotProject implements IBotProject {
         '!(scripts/**)',
         '!(settings/appsettings.json)',
         '!(**/luconfig.json)',
-      ].concat(process.env.COMPOSER_PVA_TOPICS === 'true' ? PVATopicFilePatterns : []),
+      ],
       root
     );
 
diff --git a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
index 85258b12b4..4e5c091dc3 100644
--- a/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
+++ b/Composer/packages/ui-plugins/select-dialog/src/ComboBoxField.tsx
@@ -71,13 +71,14 @@ export const ComboBoxField: React.FC<ComboBoxFieldProps> = (props) => {
       <FieldLabel description={description} helpLink={uiOptions?.helpLink} id={id} label={label} required={required} />
       <ComboBox
         useComboBoxAsMenuWidth
-        autoComplete="off"
+        autoComplete="on"
         id={id}
         options={options}
         selectedKey={comboboxTitle ? 'customTitle' : value}
+        styles={{ optionsContainerWrapper: { maxHeight: '540px' } }}
         onBlur={() => onBlur?.(id, value)}
+        onChange={onChange}
         onFocus={() => onFocus?.(id, value)}
-        onItemClick={onChange}
         onRenderOption={onRenderOption}
       />
     </React.Fragment>
diff --git a/extensions/pvaPublish/src/node/publish.ts b/extensions/pvaPublish/src/node/publish.ts
index c4ee3db8c5..931108ac75 100644
--- a/extensions/pvaPublish/src/node/publish.ts
+++ b/extensions/pvaPublish/src/node/publish.ts
@@ -260,8 +260,7 @@ export const pull = async (
     const accessToken = await getAccessToken(creds);
 
     // fetch zip containing bot content
-    const query = process.env.COMPOSER_PVA_TOPICS === 'true' ? '?includeTopics=true' : '';
-    const url = `${base}api/botmanagement/${API_VERSION}/environments/${envId}/bots/${botId}/composer/content${query}`;
+    const url = `${base}api/botmanagement/${API_VERSION}/environments/${envId}/bots/${botId}/composer/content?includeTopics=true`;
     const options: RequestInit = {
       method: 'GET',
       headers: getAuthHeaders(accessToken, tenantId),