diff --git a/ide/qml/NbWindow.qml b/ide/qml/NbWindow.qml
index 858fb5e..8b51793 100644
--- a/ide/qml/NbWindow.qml
+++ b/ide/qml/NbWindow.qml
@@ -190,6 +190,10 @@
                         notebook.runCell(uuid)
                     }
 
+                    onQuitClicked: {
+                        notebook.quitCell(uuid)
+                    }
+
                     onCellFocused: {
                         codeEditor.currentIndex = index
                     }
diff --git a/ide/qml/NotebookCell.qml b/ide/qml/NotebookCell.qml
index 7653dd7..d1c285b 100644
--- a/ide/qml/NotebookCell.qml
+++ b/ide/qml/NotebookCell.qml
@@ -19,6 +19,7 @@
     signal cellFocused()
     signal cellUnfocused()
     signal runClicked()
+    signal quitClicked()
     signal deleteClicked()
 
     height: column.height
@@ -61,13 +62,20 @@
 
                 RoundButton {
                     Layout.alignment: Qt.AlignTop
-                    icon.source: iconForState(root.state)
+                    icon.source: iconForState(root.status)
                     icon.color: Material.color(Material.Grey, Material.Shade600)
                     flat: true
 
-                    onClicked: root.runClicked()
+                    onClicked: {
+                        if (root.status == Cell.IDLE)
+                            root.runClicked()
+                        else if (root.status == Cell.RUNNING)
+                            root.quitClicked()
+                    }
 
                     function iconForState(state) {
+                        console.log("iconForState", state);
+
                         if (state === Cell.RUNNING)
                             return "qrc:///icons/square.svg"