diff --git a/frontend/src/router/DocsQA.tsx b/frontend/src/router/DocsQA.tsx
index 717014ad..6a9e448b 100644
--- a/frontend/src/router/DocsQA.tsx
+++ b/frontend/src/router/DocsQA.tsx
@@ -6,7 +6,7 @@ import ScreenFallbackLoader from '@/components/base/molecules/ScreenFallbackLoad
import DataHub from '@/screens/dashboard/docsqa/DataSources'
import NavBar from '@/screens/dashboard/docsqa/Navbar'
import Applications from '@/screens/dashboard/docsqa/Applications'
-const DocsQA = lazy(() => import('@/screens/dashboard/docsqa'))
+const DocsQA = lazy(() => import('@/screens/dashboard/docsqa/main'))
const DocsQAChatbot = lazy(() => import('@/screens/dashboard/docsqa/Chatbot'))
const DocsQASettings = lazy(() => import('@/screens/dashboard/docsqa/settings'))
diff --git a/frontend/src/screens/dashboard/docsqa/main/DocsQA.tsx b/frontend/src/screens/dashboard/docsqa/main/DocsQA.tsx
new file mode 100644
index 00000000..d4f05997
--- /dev/null
+++ b/frontend/src/screens/dashboard/docsqa/main/DocsQA.tsx
@@ -0,0 +1,44 @@
+import React, { useState } from 'react'
+
+import Spinner from '@/components/base/atoms/Spinner/Spinner'
+import ApplicationModal from './components/ApplicationModal'
+import NoCollections from '../NoCollections'
+import { useDocsQAContext } from './context'
+import ConfigSidebar from './components/ConfigSidebar'
+import Chat from './components/Chat'
+
+const DocsQA = () => {
+ const { selectedCollection, isCollectionsLoading } = useDocsQAContext()
+
+ const [isCreateApplicationModalOpen, setIsCreateApplicationModalOpen] =
+ useState(false)
+
+ return (
+ <>
+ {isCreateApplicationModalOpen && (
+
+ Select a collection from sidebar,
+
review all the settings and start asking Questions
+