2 files changed, 15 insertions, 9 deletions
diff --git a/grc/gui/Colors.py b/grc/gui/Colors.py
index acc7f22c44..01c461ada5 100644
--- a/grc/gui/Colors.py
+++ b/grc/gui/Colors.py
@@ -96,7 +96,6 @@ SHORT_VECTOR_COLOR_SPEC = _color_parse('#CCCC33')
 BYTE_VECTOR_COLOR_SPEC = _color_parse('#CC66CC')
 
 PARAM_ENTRY_COLORS = {
-
     # Number types
     'complex': COMPLEX_COLOR_SPEC,
     'real': FLOAT_COLOR_SPEC,
@@ -115,8 +114,6 @@ PARAM_ENTRY_COLORS = {
     'string': BYTE_VECTOR_COLOR_SPEC,
     'id': ID_COLOR_SPEC,
     'stream_id': ID_COLOR_SPEC,
-    'grid_pos': INT_VECTOR_COLOR_SPEC,
-    'notebook': INT_VECTOR_COLOR_SPEC,
     'raw': WILDCARD_COLOR_SPEC,
 }
 
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index 61144386b4..3d4bf10308 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -179,26 +179,35 @@ class MainWindow(Gtk.Window):
         #  to be hidden as well.
 
         if panel == self.BLOCKS:
-            self.btwin.set_visible(visibility)
+            if visibility:
+	        self.btwin.show()
+            else:
+	        self.btwin.hide()
         elif panel == self.CONSOLE:
-            self.console_window.set_visible(visibility)
+            if visibility:
+	        self.console_window.show()
+            else:
+	        self.console_window.hide()
         elif panel == self.VARIABLES:
-            self.vars.set_visible(visibility)
+            if visibility:
+	        self.vars.show()
+            else:
+	        self.vars.hide()
         else:
             return
 
         if self.variable_panel_sidebar:
             # If both the variable editor and block panels are hidden, hide the right container
-            if not self.btwin.get_visible() and not self.vars.get_visible():
+            if not (self.btwin.get_property('visible')) and not (self.vars.get_property('visible')):
                 self.right.hide()
             else:
                 self.right.show()
         else:
-            if not self.btwin.get_visible():
+            if not (self.btwin.get_property('visible')):
                 self.right.hide()
             else:
                 self.right.show()
-            if not self.vars.get_visible() and not self.console_window.get_visible():
+            if not (self.vars.get_property('visible')) and not (self.console_window.get_property('visible')):
                 self.left_subpanel.hide()
             else:
                 self.left_subpanel.show()