diff --git a/package-lock.json b/package-lock.json
index d5addf2749b..82d3324a9b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,9 +11,6 @@
         "configs/*",
         "scripts"
       ],
-      "dependencies": {
-        "electron": "^23.3.12"
-      },
       "devDependencies": {
         "@babel/core": "7.16.0",
         "@babel/parser": "7.16.0",
diff --git a/packages/compass-components/src/components/feedback-popover.spec.tsx b/packages/compass-components/src/components/feedback-popover.spec.tsx
new file mode 100644
index 00000000000..6daed4ea5dc
--- /dev/null
+++ b/packages/compass-components/src/components/feedback-popover.spec.tsx
@@ -0,0 +1,72 @@
+import React, { useState } from 'react';
+import { expect } from 'chai';
+import { render, screen, cleanup, fireEvent } from '@testing-library/react';
+
+import { FeedbackPopover } from './feedback-popover';
+
+function FeedbackPopoverRenderer(
+  props: Partial<React.ComponentProps<typeof FeedbackPopover>>
+) {
+  const buttonRef = React.createRef<any>();
+  const [open, setOpen] = useState(false);
+
+  return (
+    <div>
+      <button
+        data-testid="open-feedback-button"
+        ref={buttonRef}
+        onClick={() => setOpen(!open)}
+      >
+        Feedback Button
+      </button>
+      <FeedbackPopover
+        label="test"
+        placeholder=""
+        refEl={buttonRef}
+        open={open}
+        setOpen={setOpen}
+        onSubmitFeedback={() => {
+          /* no-op */
+        }}
+        {...props}
+      />
+    </div>
+  );
+}
+
+const renderFeedbackPopover = (
+  props: Partial<React.ComponentProps<typeof FeedbackPopover>>
+) => {
+  render(<FeedbackPopoverRenderer {...props} />);
+};
+
+describe('FeedbackPopover', function () {
+  afterEach(function () {
+    cleanup();
+  });
+
+  it('renders the popover and passes feedback when submitted', async function () {
+    let feedbackText = '';
+    renderFeedbackPopover({
+      onSubmitFeedback: (text: string) => {
+        feedbackText = text;
+      },
+    });
+
+    expect(screen.queryByRole('textbox')).to.not.exist;
+
+    screen.getByTestId('open-feedback-button').click();
+
+    const textArea = screen.getByTestId('feedback-popover-textarea');
+    expect(textArea).to.be.visible;
+    fireEvent.change(textArea, {
+      target: { value: 'pineapple' },
+    });
+
+    screen.getByText('Submit').click();
+    // Wait for the event to go through.
+    await new Promise((resolve) => setTimeout(resolve, 3));
+
+    expect(feedbackText).to.equal('pineapple');
+  });
+});
diff --git a/packages/compass-components/src/components/feedback-popover.tsx b/packages/compass-components/src/components/feedback-popover.tsx
new file mode 100644
index 00000000000..7994f5d56e1
--- /dev/null
+++ b/packages/compass-components/src/components/feedback-popover.tsx
@@ -0,0 +1,103 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { GuideCue as LGGuideCue } from '@leafygreen-ui/guide-cue';
+
+import { TextArea, css, spacing, useId } from '..';
+
+const guideCueStyles = css({
+  minWidth: spacing[7] * 4,
+});
+
+type LGGuideCueProps = React.ComponentProps<typeof LGGuideCue>;
+
+// Omit the props we are handling.
+export type FeedbackPopoverProps = Omit<
+  LGGuideCueProps,
+  'currentStep' | 'numberOfSteps' | 'children' | 'title'
+> & {
+  onSubmitFeedback: (text: string) => void;
+  placeholder: string;
+  label: string;
+};
+
+export const FeedbackPopover = ({
+  onSubmitFeedback,
+  label,
+  placeholder,
+  setOpen,
+  refEl,
+  open,
+  ...props
+}: FeedbackPopoverProps) => {
+  const [feedbackText, setFeedbackText] = useState('');
+  const feedbackPopoverId = useId();
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+    const listener = (event: MouseEvent) => {
+      const popover = document.querySelector(
+        `[data-popoverid="feedback-popover-${feedbackPopoverId}"]`
+      );
+      if (!popover) {
+        return;
+      }
+
+      // Clicked within popover or the trigger.
+      if (
+        event.composedPath().includes(popover) ||
+        event.composedPath().includes(refEl.current!)
+      ) {
+        return;
+      }
+
+      setOpen(false);
+    };
+
+    document.addEventListener('mousedown', listener);
+    return () => {
+      document.removeEventListener('mousedown', listener);
+    };
+  }, [feedbackPopoverId, open, setOpen]);
+
+  const onTextAreaKeyDown = useCallback(
+    (evt: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      if (evt.key === 'Enter' && !evt.shiftKey) {
+        evt.preventDefault();
+        onSubmitFeedback(feedbackText);
+      } else if (evt.key === 'Escape') {
+        evt.preventDefault();
+        setOpen(false);
+      }
+    },
+    [feedbackText, setOpen, onSubmitFeedback]
+  );
+
+  return (
+    <LGGuideCue
+      tooltipClassName={guideCueStyles}
+      numberOfSteps={1}
+      currentStep={1}
+      data-popoverid={`feedback-popover-${feedbackPopoverId}`}
+      title=""
+      tooltipAlign="bottom"
+      refEl={refEl}
+      onPrimaryButtonClick={() => onSubmitFeedback(feedbackText)}
+      buttonText="Submit"
+      setOpen={setOpen}
+      open={open}
+      {...props}
+    >
+      <TextArea
+        label={label}
+        data-testid="feedback-popover-textarea"
+        placeholder={placeholder}
+        value={feedbackText}
+        onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) =>
+          setFeedbackText(event.target.value)
+        }
+        onKeyDown={onTextAreaKeyDown}
+      />
+    </LGGuideCue>
+  );
+};
diff --git a/packages/compass-components/src/index.ts b/packages/compass-components/src/index.ts
index 6225347e16f..33f577fc814 100644
--- a/packages/compass-components/src/index.ts
+++ b/packages/compass-components/src/index.ts
@@ -135,6 +135,7 @@ export type IconGlyph = Extract<keyof typeof glyphs, string>;
 
 export { EmptyContent } from './components/empty-content';
 export { ErrorBoundary } from './components/error-boundary';
+export { FeedbackPopover } from './components/feedback-popover';
 export { StoreConnector } from './components/store-connector';
 export { TabNavBar } from './components/tab-nav-bar';
 export { WorkspaceContainer } from './components/workspace-container';
diff --git a/packages/compass-query-bar/src/components/generative-ai/ai-text-input.spec.tsx b/packages/compass-query-bar/src/components/generative-ai/ai-text-input.spec.tsx
index 6e9faf3d2dc..53b09600fa0 100644
--- a/packages/compass-query-bar/src/components/generative-ai/ai-text-input.spec.tsx
+++ b/packages/compass-query-bar/src/components/generative-ai/ai-text-input.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ComponentProps } from 'react';
-import { cleanup, render, screen } from '@testing-library/react';
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
 import { expect } from 'chai';
 import sinon from 'sinon';
 import type { SinonSpy } from 'sinon';
@@ -8,7 +8,12 @@ import { Provider } from 'react-redux';
 
 import { AITextInput } from './ai-text-input';
 import { configureStore } from '../../stores/query-bar-store';
-import { changeAIPromptText } from '../../stores/ai-query-reducer';
+import {
+  AIQueryActionTypes,
+  changeAIPromptText,
+} from '../../stores/ai-query-reducer';
+import { DEFAULT_FIELD_VALUES } from '../../constants/query-bar-store';
+import { mapQueryToFormFields } from '../../utils/query';
 
 const noop = () => {
   /* no op */
@@ -27,6 +32,8 @@ const renderAITextInput = ({
   return store;
 };
 
+const feedbackPopoverTextAreaId = 'feedback-popover-textarea';
+
 describe('QueryBar Component', function () {
   let store: ReturnType<typeof configureStore>;
   let onCloseSpy: SinonSpy;
@@ -69,4 +76,58 @@ describe('QueryBar Component', function () {
       expect(store.getState().aiQuery.aiPromptText).to.equal('');
     });
   });
+
+  describe('QueryFeedback', function () {
+    beforeEach(function () {
+      store = renderAITextInput({
+        onClose: onCloseSpy,
+      });
+    });
+
+    it('should log a telemetry event with the entered text on submit', async function () {
+      // Note: This is coupling this test with internals of the logger and telemetry.
+      // We're doing this as this is a unique case where we're using telemetry
+      // for feedback. Avoid repeating this elsewhere.
+      const trackingLogs: any[] = [];
+      process.on('compass:track', (event) => trackingLogs.push(event));
+
+      // No feedback popover is shown yet.
+      expect(screen.queryByTestId(feedbackPopoverTextAreaId)).to.not.exist;
+      expect(screen.queryByTestId('ai-query-feedback-thumbs-up')).to.not.exist;
+
+      store.dispatch({
+        type: AIQueryActionTypes.AIQuerySucceeded,
+        fields: mapQueryToFormFields(DEFAULT_FIELD_VALUES),
+      });
+
+      expect(screen.queryByTestId(feedbackPopoverTextAreaId)).to.not.exist;
+      const thumbsUpButton = screen.getByTestId('ai-query-feedback-thumbs-up');
+      expect(thumbsUpButton).to.be.visible;
+      thumbsUpButton.click();
+
+      const textArea = screen.getByTestId(feedbackPopoverTextAreaId);
+      expect(textArea).to.be.visible;
+      fireEvent.change(textArea, {
+        target: { value: 'this is the query I was looking for' },
+      });
+
+      screen.getByText('Submit').click();
+
+      // Let the track event occur.
+      await new Promise((resolve) => setTimeout(resolve, 6));
+
+      // No feedback popover is shown.
+      expect(screen.queryByTestId(feedbackPopoverTextAreaId)).to.not.exist;
+
+      expect(trackingLogs).to.deep.equal([
+        {
+          event: 'AIQuery Feedback',
+          properties: {
+            feedback: 'positive',
+            text: 'this is the query I was looking for',
+          },
+        },
+      ]);
+    });
+  });
 });
diff --git a/packages/compass-query-bar/src/components/generative-ai/ai-text-input.tsx b/packages/compass-query-bar/src/components/generative-ai/ai-text-input.tsx
index a522620a97b..369c0f6354d 100644
--- a/packages/compass-query-bar/src/components/generative-ai/ai-text-input.tsx
+++ b/packages/compass-query-bar/src/components/generative-ai/ai-text-input.tsx
@@ -22,6 +22,7 @@ import {
   changeAIPromptText,
   runAIQuery,
 } from '../../stores/ai-query-reducer';
+import { QueryFeedback } from './query-feedback';
 
 const containerStyles = css({
   display: 'flex',
@@ -31,14 +32,21 @@ const containerStyles = css({
   marginTop: '2px',
 });
 
+const inputBarContainerStyles = css({
+  paddingTop: spacing[2],
+  gap: spacing[2],
+  flexGrow: 1,
+  display: 'flex',
+});
+
 const inputContainerStyles = css({
   display: 'flex',
+  flexGrow: 1,
   position: 'relative',
-  paddingTop: spacing[2],
 });
 
 const textInputStyles = css({
-  width: '100%',
+  flexGrow: 1,
 });
 
 const errorSummaryContainer = css({
@@ -47,7 +55,6 @@ const errorSummaryContainer = css({
 
 const floatingButtonsContainerStyles = css({
   position: 'absolute',
-  top: spacing[2],
   right: spacing[1],
   display: 'flex',
   gap: spacing[2],
@@ -152,11 +159,11 @@ const SubmitArrowSVG = ({ darkMode }: { darkMode?: boolean }) => (
 
 type AITextInputProps = {
   aiPromptText: string;
-  onCancelAIQuery: () => void;
-  isFetching?: boolean;
   didSucceed: boolean;
   errorMessage?: string;
+  isFetching?: boolean;
   show: boolean;
+  onCancelAIQuery: () => void;
   onChangeAIPromptText: (text: string) => void;
   onClose: () => void;
   onSubmitText: (text: string) => void;
@@ -164,11 +171,11 @@ type AITextInputProps = {
 
 function AITextInput({
   aiPromptText,
-  onCancelAIQuery,
-  isFetching,
   didSucceed,
   errorMessage,
+  isFetching,
   show,
+  onCancelAIQuery,
   onClose,
   onChangeAIPromptText,
   onSubmitText,
@@ -221,87 +228,90 @@ function AITextInput({
 
   return (
     <div className={containerStyles}>
-      <div className={inputContainerStyles}>
-        <TextInput
-          className={textInputStyles}
-          ref={promptTextInputRef}
-          sizeVariant="small"
-          aria-label="Enter a plain text query that the AI will translate into MongoDB query language."
-          placeholder="Tell Compass what documents to find (e.g. which movies were released in 2000)"
-          value={aiPromptText}
-          onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
-            onChangeAIPromptText(evt.currentTarget.value)
-          }
-          onKeyDown={onTextInputKeyDown}
-        />
-        <div className={floatingButtonsContainerStyles}>
-          {aiPromptText && (
-            <IconButton
-              aria-label="Clear query prompt"
-              onClick={() => onChangeAIPromptText('')}
-              data-testid="ai-text-clear-prompt"
-            >
-              <Icon glyph="X" />
-            </IconButton>
-          )}
-          <Button
-            size="small"
-            className={cx(
-              generateButtonStyles,
-              !darkMode && generateButtonLightModeStyles
-            )}
-            onClick={() =>
-              isFetching ? onCancelAIQuery() : onSubmitText(aiPromptText)
+      <div className={inputBarContainerStyles}>
+        <div className={inputContainerStyles}>
+          <TextInput
+            className={textInputStyles}
+            ref={promptTextInputRef}
+            sizeVariant="small"
+            aria-label="Enter a plain text query that the AI will translate into MongoDB query language."
+            placeholder="Tell Compass what documents to find (e.g. which movies were released in 2000)"
+            value={aiPromptText}
+            onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
+              onChangeAIPromptText(evt.currentTarget.value)
             }
-          >
+            onKeyDown={onTextInputKeyDown}
+          />
+          <div className={floatingButtonsContainerStyles}>
+            {aiPromptText && (
+              <IconButton
+                aria-label="Clear query prompt"
+                onClick={() => onChangeAIPromptText('')}
+                data-testid="ai-text-clear-prompt"
+              >
+                <Icon glyph="X" />
+              </IconButton>
+            )}
+            <Button
+              size="small"
+              className={cx(
+                generateButtonStyles,
+                !darkMode && generateButtonLightModeStyles
+              )}
+              onClick={() =>
+                isFetching ? onCancelAIQuery() : onSubmitText(aiPromptText)
+              }
+            >
+              {isFetching ? (
+                <>
+                  <div>Cancel</div>
+                  <span
+                    className={cx(
+                      buttonHighlightStyles,
+                      darkMode
+                        ? buttonHighlightDarkModeStyles
+                        : buttonHighlightLightModeStyles
+                    )}
+                  >
+                    esc
+                  </span>
+                </>
+              ) : (
+                <>
+                  <div>Generate</div>
+                  <SubmitArrowSVG darkMode={darkMode} />
+                </>
+              )}
+            </Button>
             {isFetching ? (
-              <>
-                <div>Cancel</div>
-                <span
-                  className={cx(
-                    buttonHighlightStyles,
+              <div className={loaderContainerStyles}>
+                <SpinLoader />
+              </div>
+            ) : showSuccess ? (
+              <div className={loaderContainerStyles}>
+                <Icon
+                  className={
                     darkMode
-                      ? buttonHighlightDarkModeStyles
-                      : buttonHighlightLightModeStyles
-                  )}
-                >
-                  esc
-                </span>
-              </>
+                      ? successIndicatorDarkModeStyles
+                      : successIndicatorLightModeStyles
+                  }
+                  glyph="CheckmarkWithCircle"
+                />
+              </div>
             ) : (
-              <>
-                <div>Generate</div>
-                <SubmitArrowSVG darkMode={darkMode} />
-              </>
+              <button
+                className={closeAIButtonStyles}
+                data-testid="close-ai-query-button"
+                aria-label={closeText}
+                title={closeText}
+                onClick={() => onClose()}
+              >
+                {isFetching ? <SpinLoader /> : <RobotSVG />}
+              </button>
             )}
-          </Button>
-          {isFetching ? (
-            <div className={loaderContainerStyles}>
-              <SpinLoader />
-            </div>
-          ) : showSuccess ? (
-            <div className={loaderContainerStyles}>
-              <Icon
-                className={
-                  darkMode
-                    ? successIndicatorDarkModeStyles
-                    : successIndicatorLightModeStyles
-                }
-                glyph="CheckmarkWithCircle"
-              />
-            </div>
-          ) : (
-            <button
-              className={closeAIButtonStyles}
-              data-testid="close-ai-query-button"
-              aria-label={closeText}
-              title={closeText}
-              onClick={() => onClose()}
-            >
-              {isFetching ? <SpinLoader /> : <RobotSVG />}
-            </button>
-          )}
+          </div>
         </div>
+        {didSucceed && <QueryFeedback />}
       </div>
       {errorMessage && (
         <div className={errorSummaryContainer}>
diff --git a/packages/compass-query-bar/src/components/generative-ai/query-feedback.tsx b/packages/compass-query-bar/src/components/generative-ai/query-feedback.tsx
new file mode 100644
index 00000000000..844820af2d0
--- /dev/null
+++ b/packages/compass-query-bar/src/components/generative-ai/query-feedback.tsx
@@ -0,0 +1,186 @@
+import {
+  Button,
+  Disclaimer,
+  FeedbackPopover,
+  Icon,
+  css,
+  spacing,
+  cx,
+  keyframes,
+  palette,
+  useDarkMode,
+} from '@mongodb-js/compass-components';
+import React, { useEffect, useRef, useState } from 'react';
+import createLoggerAndTelemetry from '@mongodb-js/compass-logging';
+
+const { log, mongoLogId, track } = createLoggerAndTelemetry('AI-QUERY-UI');
+
+const suggestionActionButtonStyles = css({
+  flexShrink: 0,
+  display: 'flex',
+  gap: spacing[2],
+});
+
+const fadeOutAnimationTimeMS = 2000;
+
+const fadeOutWidthAnimation = keyframes({
+  '0%': {
+    width: spacing[7],
+  },
+  '90%': {
+    width: spacing[7],
+  },
+  '100%': {
+    width: 0,
+  },
+});
+
+const feedbackSubmittedStyles = css({
+  overflow: 'hidden',
+  animation: `${fadeOutWidthAnimation} ${fadeOutAnimationTimeMS}ms ease-in`,
+  width: 0,
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-around',
+});
+
+const submittedDarkStyles = css({
+  color: palette.green.light1,
+});
+
+const submittedLightStyles = css({
+  color: palette.green.dark1,
+});
+
+const feedbackButtonLightStyles = css({
+  // TODO(LG-3497): We fill the icon colors here as there is a bug
+  // with the LeafyGreen ThumbsUp and ThumbsDown icon fills.
+  fill: palette.gray.dark1,
+});
+
+const feedbackButtonDarkStyles = css({
+  // TODO(LG-3497): We fill the icon colors here as there is a bug
+  // with the LeafyGreen ThumbsUp and ThumbsDown icon fills.
+  fill: palette.gray.light1,
+});
+
+const buttonActivePositiveStyles = css({
+  backgroundColor: palette.green.light3,
+  borderColor: palette.green.dark1,
+  fill: palette.green.dark1,
+});
+
+const buttonActiveNegativeStyles = css({
+  backgroundColor: palette.red.light3,
+  borderColor: palette.red.dark2,
+  fill: palette.red.dark2,
+});
+
+function QueryFeedback() {
+  const darkMode = useDarkMode();
+
+  const feedbackPositiveButtonRef = useRef<HTMLInputElement>(null);
+  const feedbackNegativeButtonRef = useRef<HTMLInputElement>(null);
+
+  const [chosenFeedbackOption, setChosenFeedbackOption] = useState<
+    'none' | 'positive' | 'negative'
+  >('none');
+
+  const [didSubmit, setDidSubmit] = useState(false);
+  const [enableShowFeedbackSuccess, setEnableShowFeedbackSuccess] =
+    useState(true);
+
+  const onSubmitFeedback = (text: string) => {
+    log.info(mongoLogId(1_001_000_221), 'AIQuery', 'AI query feedback', {
+      feedback: chosenFeedbackOption,
+      text,
+    });
+
+    track('AIQuery Feedback', () => ({
+      feedback: chosenFeedbackOption,
+      text,
+    }));
+    setDidSubmit(true);
+  };
+
+  useEffect(() => {
+    if (didSubmit) {
+      const timeoutId = setTimeout(() => {
+        setEnableShowFeedbackSuccess(false);
+      }, fadeOutAnimationTimeMS);
+      return () => {
+        clearTimeout(timeoutId);
+      };
+    }
+  }, [didSubmit]);
+
+  if (didSubmit) {
+    if (!enableShowFeedbackSuccess) {
+      return null;
+    }
+
+    return (
+      <div className={feedbackSubmittedStyles}>
+        <Disclaimer
+          className={darkMode ? submittedDarkStyles : submittedLightStyles}
+        >
+          Success!
+        </Disclaimer>
+      </div>
+    );
+  }
+
+  return (
+    <div className={suggestionActionButtonStyles}>
+      <Button
+        className={cx(
+          darkMode ? feedbackButtonDarkStyles : feedbackButtonLightStyles,
+          chosenFeedbackOption === 'positive' && buttonActivePositiveStyles
+        )}
+        onClick={() => setChosenFeedbackOption('positive')}
+        size="small"
+        data-testid="ai-query-feedback-thumbs-up"
+        ref={feedbackPositiveButtonRef}
+      >
+        <Icon glyph="ThumbsUp" />
+      </Button>
+
+      <Button
+        className={cx(
+          darkMode ? feedbackButtonDarkStyles : feedbackButtonLightStyles,
+          chosenFeedbackOption === 'negative' && buttonActiveNegativeStyles
+        )}
+        onClick={() => setChosenFeedbackOption('negative')}
+        size="small"
+        ref={feedbackNegativeButtonRef}
+      >
+        <Icon glyph="ThumbsDown" />
+      </Button>
+
+      {/**
+       * We use the LGGuideCue instead of Compass' GuideCue here because
+       * this usage isn't the typical show-one-time guide cue.
+       */}
+      {chosenFeedbackOption !== 'none' && (
+        <FeedbackPopover
+          refEl={
+            chosenFeedbackOption === 'positive'
+              ? feedbackPositiveButtonRef
+              : feedbackNegativeButtonRef
+          }
+          open
+          setOpen={() => setChosenFeedbackOption('none')}
+          onSubmitFeedback={onSubmitFeedback}
+          label="Provide Feedback"
+          placeholder={
+            chosenFeedbackOption === 'positive'
+              ? 'What do you like about the generated query?'
+              : 'What could be better about the generated query?'
+          }
+        />
+      )}
+    </div>
+  );
+}
+
+export { QueryFeedback };
diff --git a/packages/compass-query-bar/src/stores/ai-query-reducer.spec.ts b/packages/compass-query-bar/src/stores/ai-query-reducer.spec.ts
index 7f8483d04ec..69c20a83b5c 100644
--- a/packages/compass-query-bar/src/stores/ai-query-reducer.spec.ts
+++ b/packages/compass-query-bar/src/stores/ai-query-reducer.spec.ts
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { promises as fs } from 'fs';
 import os from 'os';
 import Sinon from 'sinon';
+
 import configureStore from './query-bar-store';
 import type { QueryBarStoreOptions } from './query-bar-store';
 import {
diff --git a/packages/compass-query-bar/src/stores/ai-query-reducer.ts b/packages/compass-query-bar/src/stores/ai-query-reducer.ts
index c2158c3c8c8..dafe94f4c2f 100644
--- a/packages/compass-query-bar/src/stores/ai-query-reducer.ts
+++ b/packages/compass-query-bar/src/stores/ai-query-reducer.ts
@@ -327,7 +327,6 @@ const aiQueryReducer: Reducer<AIQueryState> = (
       ...state,
       status: 'success',
       aiQueryFetchId: -1,
-      didSucceed: true,
     };
   }
 
@@ -361,6 +360,8 @@ const aiQueryReducer: Reducer<AIQueryState> = (
   ) {
     return {
       ...state,
+      // Reset the status after a successful run when the user change's the text.
+      status: state.status === 'success' ? 'ready' : state.status,
       aiPromptText: action.text,
     };
   }