diff --git a/addie/calculate_gr/event_handler.py b/addie/calculate_gr/event_handler.py
index 188ed299..da96fa67 100644
--- a/addie/calculate_gr/event_handler.py
+++ b/addie/calculate_gr/event_handler.py
@@ -169,6 +169,8 @@ def generate_gr_step1(main_window):
     generate_gr_step2(main_window,
                       sq_ws_name_list=sq_ws_name_list)
 
+    gr_widgets_status(main_window, True)
+
 
 def generate_gr_step2(main_window, sq_ws_name_list):
     """Generate G(r) from specified S(Q) workspaces
diff --git a/addie/calculate_gr/gofrtree.py b/addie/calculate_gr/gofrtree.py
index 4dc040ae..a86b4994 100644
--- a/addie/calculate_gr/gofrtree.py
+++ b/addie/calculate_gr/gofrtree.py
@@ -80,6 +80,7 @@ def pop_up_menu(self):
                 print('[Error] Nodes of different levels are selected.')
 
         if leaf_level == 1:
+            self.removeAction(self._action_remove_plot)
             self.addAction(self._action_plot)
             self.addAction(self._action_ipython)
             self.addAction(self._action_delete)
@@ -205,7 +206,8 @@ def is_gr_empty(self):
         gr_exists = False
         for key in self._leafDict.keys():
             if key.startswith('G(r)'):
-                gr_exists = True
+                if len(self._leafDict[key]) > 0:
+                    gr_exists = True
         return not gr_exists
 
     def is_sofq_empty(self):