diff --git a/src/popupmenu.c b/src/popupmenu.c
index 90ffe0e..4d77c66 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -777,10 +777,7 @@
 			}
 
 			if (attrs != NULL)
-			{
-			    vim_free(attrs);
-			    attrs = NULL;
-			}
+			    VIM_CLEAR(attrs);
 
 			if (*p != TAB)
 			    break;
@@ -790,14 +787,14 @@
 			if (pum_rl)
 			{
 			    screen_puts_len((char_u *)"  ", 2, row, col - 1,
-								    orig_attr);
+								    attr);
 			    col -= 2;
 			}
 			else
 #endif
 			{
 			    screen_puts_len((char_u *)"  ", 2, row, col,
-								    orig_attr);
+								    attr);
 			    col += 2;
 			}
 			totwidth += 2;
@@ -826,7 +823,7 @@
 	    if (pum_rl)
 	    {
 		screen_fill(row, row + 1, pum_col - basic_width - n + 1,
-						    col + 1, ' ', ' ', attr);
+						    col + 1, ' ', ' ', orig_attr);
 		col = pum_col - basic_width - n;
 	    }
 	    else