diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 4dfdd086d52..29c79ec0d30 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1882,7 +1882,7 @@ static void world_panel_mistaph(World *wrld)
 	uiBlockEndAlign(block);
 
 	uiBlockSetCol(block, TH_BUT_SETTING1);
-	uiDefButS(block, TOG|BIT|1,B_DIFF,	"Stars",160,120,140,19, &wrld->mode, 0, 0, 0, 0, "Toggles starfield generation");
+	uiDefButS(block, TOG|BIT|1,REDRAWVIEW3D,	"Stars",160,120,140,19, &wrld->mode, 0, 0, 0, 0, "Toggles starfield generation");
 	uiBlockSetCol(block, TH_AUTO);
 	
 	uiBlockBeginAlign(block);
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 4f7fd109621..9036e5e6fca 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -1836,9 +1836,11 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 		drawfloor();
 		if(G.vd->persp==2) {
 			if(G.scene->world) {
-				if(G.scene->world->mode & WO_STARS) RE_make_stars(star_stuff_init_func,
-																  star_stuff_vertex_func,
-																  star_stuff_term_func);
+				if(G.scene->world->mode & WO_STARS) {
+					RE_make_stars(star_stuff_init_func, star_stuff_vertex_func,
+								  star_stuff_term_func);
+					G.afbreek= 0; /* silly, stars draw uses blender_test_break(), can cause render to stop */
+				}
 			}
 			if(G.vd->flag & V3D_DISPBGPIC) draw_bgpic();
 		}