diff --git a/main/astrodatagui/AstrodataGUI.py b/main/astrodatagui/AstrodataGUI.py
index 88adcab..49f27a9 100644
--- a/main/astrodatagui/AstrodataGUI.py
+++ b/main/astrodatagui/AstrodataGUI.py
@@ -354,11 +354,13 @@ class AstrodataGUI(QtWidgets.QMainWindow):
 
     def btCountAllFlaresClickedDone(self, allFlaresDictList):
         self.calcAllFlaresThread = None
+        self.btCountAllFlaresClicked.setEnabled(True)
         self.AllFlaresWindow = FlareSummaryPlotGUI(allFlaresDictList)
         self.AllFlaresWindow.show()
 
     def btCountAllFlaresClicked(self):
         if(self.calcAllFlaresThread is None):
+            self.btCountAllFlaresClicked.setEnabled(False)
             allStarsDictList = pd.DataFrame(columns=["StarName",
                                                      "SpType",
                                                      "RotVel",