diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx
index e680d6eb8..99a0c9613 100644
--- a/src/debugger/gui/RomListWidget.cxx
+++ b/src/debugger/gui/RomListWidget.cxx
@@ -64,11 +64,9 @@ RomListWidget::RomListWidget(GuiObject* boss, const GUI::Font& font,
   l.push_back("Save ROM", "saverom");
   l.push_back("Set PC", "setpc");
   l.push_back("RunTo PC", "runtopc");
-  l.push_back("------------------", "");
-  l.push_back("Show PC addresses", "showaddr");
-  l.push_back("Hide PC addresses", "hideaddr");
-  l.push_back("Show GFX as binary", "gfxbin");
-  l.push_back("Show GFX as hex", "gfxhex");
+  l.push_back("---------------------", "");
+  l.push_back("Toggle PC addresses", "pcaddr");
+  l.push_back("Toggle GFX binary/hex", "gfx");
   l.push_back("Re-disassemble", "disasm");
   myMenu = new ContextMenu(this, font, l);
 
diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx
index 2404e6b86..8f31d2893 100644
--- a/src/debugger/gui/RomWidget.cxx
+++ b/src/debugger/gui/RomWidget.cxx
@@ -175,35 +175,28 @@ void RomWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
         runtoPC(myRomList->getSelected());
       else if(rmb == "disasm")
         invalidate();
-      else if(rmb == "showaddr")
+      else if(rmb == "pcaddr")
       {
-        if(DiStella::settings.show_addresses)
-          return;
-        DiStella::settings.show_addresses = true;
-        instance().settings().setString("showaddr", "true");
+        DiStella::settings.show_addresses = !DiStella::settings.show_addresses;
+        instance().settings().setString("showaddr",
+            DiStella::settings.show_addresses ? "true" : "false");
         invalidate();
       }
-      else if(rmb == "hideaddr")
+      else if(rmb == "gfx")
       {
-        if(!DiStella::settings.show_addresses)
-          return;
-        DiStella::settings.show_addresses = false;
-        instance().settings().setString("showaddr", "false");
+        if(DiStella::settings.gfx_format == kBASE_16)
+        {
+          DiStella::settings.gfx_format = kBASE_2;
+          instance().settings().setString("gfxformat", "2");
+        }
+        else
+        {
+          DiStella::settings.gfx_format = kBASE_16;
+          instance().settings().setString("gfxformat", "16");
+        }
         invalidate();
       }
-      else if(rmb == "gfxbin")
-      {
-        DiStella::settings.gfx_format = kBASE_2;
-        instance().settings().setString("gfxformat", "2");
-        invalidate();
-      }
-      else if(rmb == "gfxhex")
-      {
-        DiStella::settings.gfx_format = kBASE_16;
-        instance().settings().setString("gfxformat", "16");
-        invalidate();
-      }
-      break;
+      break;  // kCMenuItemSelectedCmd
     }
 
     case kDGItemDataChangedCmd: