diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 0a7e1ed15bc..bdbf753adc4 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -324,8 +324,8 @@ static void draw_cursor(SpaceText *st) {
 		if(i) glRecti(x, curarea->winy-st->lheight*(h)-2, i, curarea->winy-st->lheight*(h+1)-2);
 
 	}
-
-	glColor3f(0.0, 0.0, 0.0);
+	
+	BIF_ThemeColor(TH_TEXT);
 }
 
 static void calc_text_rcts(SpaceText *st)
@@ -571,7 +571,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 		glRecti(23,  0, (st->lheight==15)?63:59,  curarea->winy - 2);
 	}
 
-	glColor3f(0.0, 0.0, 0.0);
+	BIF_ThemeColor(TH_TEXT);
 
 	draw_cursor(st);
 
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index cb9b379929a..a7dadbf81bc 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -4037,7 +4037,7 @@ short pupmenu_col(char *instr, int maxrow)
 			y1 -= 6;
 		}
 		else {
-			uiDefButS(block, BUTM, B_NOP, name, x1, y1, width, boxh-1, &val, (float) md->items[a].retval, 0.0, 0, 0, "");
+			uiDefButI(block, BUTM, B_NOP, name, x1, y1, width, boxh-1, &val, (float) md->items[a].retval, 0.0, 0, 0, "");
 			y1 -= boxh;
 		}
 		//uiDefButI(block, BUTM, B_NOP, md->items[a].str, x1, y1, (short)(width-(rows>1)), (short)(boxh-1), &val, (float)md->items[a].retval, 0.0, 0, 0, "");