diff --git a/CHANGELOG.md b/CHANGELOG.md
index 446e1f5bcb..d4337e6136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   logged in [#1508](https://github.com/greenbone/gsa/pull/1508)
 
 ### Fixed
+- Fix showing loading indicator in content composers [#1613](https://github.com/greenbone/gsa/pull/1613)
 - Enable downloading csv in table dashboard [#1611](https://github.com/greenbone/gsa/pull/1611)
 - Fixed 404 URL handling in gsad which caused a XSS vulnerability [#1603](https://github.com/greenbone/gsa/pull/1603)
 - Fixed status of Tickets for task.isInTrash() and isOrphan [#1592](https://github.com/greenbone/gsa/pull/1592)
diff --git a/gsa/src/web/components/dialog/__tests__/__snapshots__/twobuttonfooter.js.snap b/gsa/src/web/components/dialog/__tests__/__snapshots__/twobuttonfooter.js.snap
index e3e19ab0ca..ad1c39881a 100644
--- a/gsa/src/web/components/dialog/__tests__/__snapshots__/twobuttonfooter.js.snap
+++ b/gsa/src/web/components/dialog/__tests__/__snapshots__/twobuttonfooter.js.snap
@@ -138,7 +138,7 @@ exports[`DialogTwoButtonFooter tests should render 1`] = `
 </div>
 `;
 
-exports[`DialogTwoButtonFooter tests should render loading 1`] = `
+exports[`DialogTwoButtonFooter tests should render loading and disable cancel button 1`] = `
 .c2 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -273,6 +273,7 @@ exports[`DialogTwoButtonFooter tests should render loading 1`] = `
   <button
     class="c3 c4 c5"
     data-testid="dialog-close-button"
+    disabled=""
     title="Cancel"
   >
     Cancel
diff --git a/gsa/src/web/components/dialog/__tests__/twobuttonfooter.js b/gsa/src/web/components/dialog/__tests__/twobuttonfooter.js
index 931c9ceab6..2431b6fdd1 100644
--- a/gsa/src/web/components/dialog/__tests__/twobuttonfooter.js
+++ b/gsa/src/web/components/dialog/__tests__/twobuttonfooter.js
@@ -34,7 +34,7 @@ describe('DialogTwoButtonFooter tests', () => {
     expect(button).toHaveStyleRule('background', Theme.lightGreen);
   });
 
-  test('should render loading', () => {
+  test('should render loading and disable cancel button', () => {
     const {element} = render(
       <DialogTwoButtonFooter rightButtonTitle="Foo" loading={true} />,
     );
@@ -42,11 +42,13 @@ describe('DialogTwoButtonFooter tests', () => {
     expect(element).toMatchSnapshot();
 
     const button = element.querySelector('button[title="Foo"]');
+    const buttonLeft = element.querySelector('button[title="Cancel"]');
 
     expect(button).toHaveStyleRule(
       'background',
       `${Theme.lightGreen} url(/img/loading.gif) center center no-repeat`,
     );
+    expect(buttonLeft).toHaveAttribute('disabled');
   });
 
   test('should render footer with default title', () => {
diff --git a/gsa/src/web/components/dialog/twobuttonfooter.js b/gsa/src/web/components/dialog/twobuttonfooter.js
index a879d81121..0109aadefe 100644
--- a/gsa/src/web/components/dialog/twobuttonfooter.js
+++ b/gsa/src/web/components/dialog/twobuttonfooter.js
@@ -43,6 +43,7 @@ const DialogTwoButtonFooter = ({
   <StyledLayout align={['end', 'center']} shrink="0">
     <Button
       data-testid="dialog-close-button"
+      disabled={loading}
       onClick={onLeftButtonClick}
       title={leftButtonTitle}
     >
diff --git a/gsa/src/web/pages/reports/alertactions.js b/gsa/src/web/pages/reports/alertactions.js
index 160884f1e2..c4f92b9468 100644
--- a/gsa/src/web/pages/reports/alertactions.js
+++ b/gsa/src/web/pages/reports/alertactions.js
@@ -117,7 +117,7 @@ class AlertActions extends React.Component {
       });
     }
 
-    gmp.report
+    return gmp.report
       .alert({
         report_id: report.id,
         alert_id: alertId,
diff --git a/gsa/src/web/pages/reports/detailspage.js b/gsa/src/web/pages/reports/detailspage.js
index 0c8f9f751e..72aec91b17 100644
--- a/gsa/src/web/pages/reports/detailspage.js
+++ b/gsa/src/web/pages/reports/detailspage.js
@@ -461,7 +461,7 @@ class ReportDetails extends React.Component {
 
     this.handleInteraction();
 
-    gmp.report
+    return gmp.report
       .download(entity, {
         reportFormatId,
         deltaReportId,