diff --git a/gptj.cpp b/gptj.cpp
index 9a7720bc..aa7db13e 100644
--- a/gptj.cpp
+++ b/gptj.cpp
@@ -707,6 +707,9 @@ void GPTJ::prompt(const std::string &prompt, std::function<bool(const std::strin
             std::cerr << "GPT-J ERROR: Failed to process prompt\n";
             return;
         }
+        // We pass a null string to see if the user has asked us to stop...
+        if (!response(""))
+            return;
         ctx.n_past += batch.size();
         i = batch_end;
     }
diff --git a/llm.cpp b/llm.cpp
index fb36709b..f8b2d94c 100644
--- a/llm.cpp
+++ b/llm.cpp
@@ -65,6 +65,7 @@ bool GPTJObject::isModelLoaded() const
 void GPTJObject::resetResponse()
 {
     m_response = std::string();
+    emit responseChanged();
 }
 
 void GPTJObject::resetContext()
@@ -88,8 +89,10 @@ bool GPTJObject::handleResponse(const std::string &response)
     printf("%s", response.c_str());
     fflush(stdout);
 #endif
-    m_response.append(response);
-    emit responseChanged();
+    if (!response.empty()) {
+        m_response.append(response);
+        emit responseChanged();
+    }
     return !m_stopGenerating;
 }
 
diff --git a/main.qml b/main.qml
index c6054e6f..20b25ec1 100644
--- a/main.qml
+++ b/main.qml
@@ -310,7 +310,7 @@ Window {
                         focus: false
                         padding: 20
                         font.pixelSize: 24
-                        cursorVisible: currentResponse ? LLM.responseInProgress : false
+                        cursorVisible: currentResponse ? (LLM.response !== "" ? LLM.responseInProgress : false) : false
                         cursorPosition: text.length
                         background: Rectangle {
                             color: name === qsTr("Response: ") ? "#444654" : "#343541"
@@ -318,6 +318,15 @@ Window {
 
                         leftPadding: 100
 
+                        BusyIndicator {
+                            anchors.left: parent.left
+                            anchors.leftMargin: 90
+                            anchors.top: parent.top
+                            anchors.topMargin: 5
+                            visible: currentResponse && LLM.response === "" && LLM.responseInProgress
+                            running: currentResponse && LLM.response === "" && LLM.responseInProgress
+                        }
+
                         Rectangle {
                             anchors.left: parent.left
                             anchors.top: parent.top