diff --git a/uppsrc/CtrlLib/MultiButton.cpp b/uppsrc/CtrlLib/MultiButton.cpp
index e1042030b..299c74313 100644
--- a/uppsrc/CtrlLib/MultiButton.cpp
+++ b/uppsrc/CtrlLib/MultiButton.cpp
@@ -446,7 +446,7 @@ void MultiButton::Paint(Draw& w)
 	if(cr.left < cr.right && display) {
 		w.Clip(clr);
 		display->Paint(w, cr, v,
-		               IsShowEnabled() ? text : SColorDisabled,
+		               IsShowEnabled() && IsEditable() ? text : SColorDisabled,
 		               paper, f ? Display::CURSOR : Display::FOCUS|Display::CURSOR);
 		w.End();
 	}
diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp
index c564c4488..27175a19f 100644
--- a/uppsrc/Draw/ImageOp.cpp
+++ b/uppsrc/Draw/ImageOp.cpp
@@ -138,7 +138,7 @@ Image ColorMask(const Image& src, Color key)
 			*t++ = *s;
 		s++;
 	}
-	ib.SetHotSpots(src;
+	ib.SetHotSpots(src);
 	return ib;
 }