diff --git a/src/sas/qtgui/Plotting/Plotter.py b/src/sas/qtgui/Plotting/Plotter.py
index 5af83f2193..af7a81ce92 100644
--- a/src/sas/qtgui/Plotting/Plotter.py
+++ b/src/sas/qtgui/Plotting/Plotter.py
@@ -279,6 +279,8 @@ def createContextMenu(self):
         # Add the title change for dialogs
         self.contextMenu.addSeparator()
         self.actionWindowTitle = self.contextMenu.addAction("Window Title")
+        self.contextMenu.addSeparator()
+        self.actionToggleMenu = self.contextMenu.addAction("Toggle Navigation Menu")
 
         # Define the callbacks
         self.actionAddText.triggered.connect(self.onAddText)
@@ -287,6 +289,7 @@ def createContextMenu(self):
         self.actionSetGraphRange.triggered.connect(self.onSetGraphRange)
         self.actionResetGraphRange.triggered.connect(self.onResetGraphRange)
         self.actionWindowTitle.triggered.connect(self.onWindowsTitle)
+        self.actionToggleMenu.triggered.connect(self.onToggleMenu)
 
     def addPlotsToContextMenu(self):
         """
diff --git a/src/sas/qtgui/Plotting/Plotter2D.py b/src/sas/qtgui/Plotting/Plotter2D.py
index b37353988d..6eaacb7b8c 100644
--- a/src/sas/qtgui/Plotting/Plotter2D.py
+++ b/src/sas/qtgui/Plotting/Plotter2D.py
@@ -184,6 +184,9 @@ def createContextMenu(self):
         self.contextMenu.addSeparator()
         self.actionChangeScale = self.contextMenu.addAction("Toggle Linear/Log Scale")
         self.actionChangeScale.triggered.connect(self.onToggleScale)
+        self.contextMenu.addSeparator()
+        self.actionToggleMenu = self.contextMenu.addAction("Toggle Navigation Menu")
+        self.actionToggleMenu.triggered.connect(self.onToggleMenu)
 
     def createContextMenuQuick(self):
         """
diff --git a/src/sas/qtgui/Plotting/PlotterBase.py b/src/sas/qtgui/Plotting/PlotterBase.py
index 7e835a2d96..4196da3436 100644
--- a/src/sas/qtgui/Plotting/PlotterBase.py
+++ b/src/sas/qtgui/Plotting/PlotterBase.py
@@ -222,16 +222,12 @@ def defaultContextMenu(self):
         self.actionSaveImage = self.contextMenu.addAction("Save Image")
         self.actionPrintImage = self.contextMenu.addAction("Print Image")
         self.actionCopyToClipboard = self.contextMenu.addAction("Copy to Clipboard")
-        #self.contextMenu.addSeparator()
-        #self.actionToggleMenu = self.contextMenu.addAction("Toggle Navigation Menu")
         self.contextMenu.addSeparator()
 
-
         # Define the callbacks
         self.actionSaveImage.triggered.connect(self.onImageSave)
         self.actionPrintImage.triggered.connect(self.onImagePrint)
         self.actionCopyToClipboard.triggered.connect(self.onClipboardCopy)
-        #self.actionToggleMenu.triggered.connect(self.onToggleMenu)
 
     def createContextMenu(self):
         """
@@ -389,13 +385,10 @@ def onToggleMenu(self):
         """
         Toggle navigation menu visibility in the chart
         """
-        self.toolbar.hide()
-        # Current toolbar menu is too buggy.
-        # Comment out until we support 3.x, then recheck.
-        #if self.toolbar.isVisible():
-        #    self.toolbar.hide()
-        #else:
-        #    self.toolbar.show()
+        if self.toolbar.isVisible():
+            self.toolbar.hide()
+        else:
+            self.toolbar.show()
 
     def offset_graph(self):
         """
diff --git a/src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py b/src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py
index bb42db6f72..bd3144da16 100644
--- a/src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py
+++ b/src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py
@@ -146,7 +146,7 @@ def done():
         # Make sure clipboard got updated.
         self.assertTrue(self.clipboard_called)
 
-        ## Trigger toggle navigation bar and make sure the method is called
+        # Trigger toggle navigation bar and make sure the method is called
         #self.assertEqual(actions[4].text(), "Toggle Navigation Menu")
         #isShown = self.plotter.toolbar.isVisible()
         #self.assertTrue(isShow)
@@ -193,5 +193,6 @@ def testOnMplWheel(self):
         """ Test what happens on mouse pick in chart """
         pass
 
+
 if __name__ == "__main__":
     unittest.main()