diff --git a/WINGs/wpopupbutton.c b/WINGs/wpopupbutton.c
index 06f0841..8140131 100644
--- a/WINGs/wpopupbutton.c
+++ b/WINGs/wpopupbutton.c
@@ -344,6 +344,28 @@ static void paintMenuEntry(PopUpButton * bPtr, int index, int highlight)
 	if (!highlight) {
 		R->fill_rect(rctx, (WMDrawable)bPtr->menuView->window, scr->gray,
 			     0, index * itemHeight, width, itemHeight);
+		title = WMGetPopUpButtonItem(bPtr, index);
+		W_DrawRelief(scr, (WMDrawable)bPtr->menuView->window,
+			     0, index * itemHeight, width, itemHeight, WRRaised);
+		{
+			WMMenuItem *item = WMGetPopUpButtonMenuItem(bPtr, index);
+			WMColor *color = (item && WMGetMenuItemEnabled(item))
+				? scr->black : scr->darkGray;
+			W_PaintText(bPtr->menuView, bPtr->menuView->window,
+				    scr->normalFont, 6,
+				    index * itemHeight + yo, width, WALeft,
+				    color, False, title, strlen(title));
+		}
+		if (!bPtr->flags.pullsDown && index == bPtr->selectedItemIndex) {
+			R->composite_pixmap(rctx,
+				(WMDrawable)bPtr->menuView->window,
+				scr->popUpIndicator, 0, 0,
+				scr->popUpIndicator->width,
+				scr->popUpIndicator->height,
+				width - scr->popUpIndicator->width - 4,
+				index * itemHeight
+				+ (itemHeight - scr->popUpIndicator->height) / 2);
+		}
 		return;
 	}