diff --git a/client/src/app/quotes/edit.tsx b/client/src/app/quotes/edit.tsx
index 3cc3ee0..491d758 100644
--- a/client/src/app/quotes/edit.tsx
+++ b/client/src/app/quotes/edit.tsx
@@ -28,6 +28,8 @@ export const QuoteEdit = () => {
   const navigate = useNavigate();
   const quoteId = useUrlId();
 
+  const [activeTab, setActiveTab] = useState("general");
+
   const [quoteCurrency, setQuoteCurrency] = useState<CurrencyData>(
     CurrencyData.createDefaultCode().object
   );
@@ -238,25 +240,29 @@ export const QuoteEdit = () => {
             </div>
           </div>
 
-          <Tabs defaultValue='items' className='space-y-4'>
+          <Tabs
+            defaultValue='items'
+            className='space-y-4'
+            value={activeTab}
+            onValueChange={setActiveTab}
+          >
             <TabsList>
               <TabsTrigger value='general'>{t("quotes.create.tabs.general")}</TabsTrigger>
               <TabsTrigger value='items'>{t("quotes.create.tabs.items")}</TabsTrigger>
               {/* <TabsTrigger value='history'>{t("quotes.create.tabs.history")}</TabsTrigger>*/}
             </TabsList>
-            <TabsContent value='general'>
+            <TabsContent value='general' forceMount hidden={"general" !== activeTab}>
               <QuoteGeneralCardEditor />
             </TabsContent>
-            <TabsContent value='items'>
+            <TabsContent value='items' forceMount hidden={"items" !== activeTab}>
               <QuoteDetailsCardEditor
                 currency={quoteCurrency}
                 language={quoteLanguage}
                 defaultValues={defaultValues}
               />
             </TabsContent>
-
-            <TabsContent value='history'></TabsContent>
           </Tabs>
+
           <div className='flex items-center justify-center gap-2 md:hidden'>
             <Button variant='outline' size='sm'>
               {t("quotes.create.buttons.discard")}