diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index d993ecabb..db6f2039e 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -133,7 +133,8 @@ inline uInt8 M6502::peek(uInt16 address, uInt8 flags)
     if(cond > -1)
     {
       myJustHitReadTrapFlag = true;
-      myHitTrapInfo.message = "RTrap(" + myTrapCondNames[cond] + "): ";
+      myHitTrapInfo.message = "RTrap"
+        + (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
       myHitTrapInfo.address = address;
     }
   }
@@ -165,7 +166,8 @@ inline void M6502::poke(uInt16 address, uInt8 value, uInt8 flags)
     if(cond > -1)
     {
       myJustHitWriteTrapFlag = true;
-      myHitTrapInfo.message = "WTrap(" + myTrapCondNames[cond] + "): ";
+      myHitTrapInfo.message = "WTrap"
+        + (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
       myHitTrapInfo.address = address;
     }
   }
diff --git a/src/gui/EditTextWidget.cxx b/src/gui/EditTextWidget.cxx
index 26db5fad0..4fac16ba0 100644
--- a/src/gui/EditTextWidget.cxx
+++ b/src/gui/EditTextWidget.cxx
@@ -72,10 +72,9 @@ void EditTextWidget::drawWidget(bool hilite)
   // Highlight changes
   if(_changed)
     s.fillRect(_x, _y, _w, _h, kDbgChangedColor);
-  if(!isEditable())
+  else if(!isEditable())
      s.fillRect(_x, _y, _w, _h, kBGColorHi);
 
-
   // Draw a thin frame around us.
   s.hLine(_x, _y, _x + _w - 1, kColor);
   s.hLine(_x, _y + _h - 1, _x +_w - 1, kShadowColor);