diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index ca8f08db58a..f107102c7fc 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3014,6 +3014,7 @@ void do_matbuts(unsigned short event)
 	case B_LAMPPRV:
 		BIF_preview_changed(ID_LA);
 		allqueue(REDRAWBUTSSHADING, 0);
+		shade_buttons_change_3d();
 		break;
 	case B_WORLDPRV:
 		BIF_preview_changed(ID_WO);
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 821be0b07e4..1a3775ac301 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -147,6 +147,7 @@
 #include "BIF_interface.h"
 #include "BIF_meshtools.h"
 #include "BIF_mywindow.h"
+#include "BIF_previewrender.h"
 #include "BIF_resources.h"
 #include "BIF_retopo.h"
 #include "BIF_screen.h"
@@ -2315,6 +2316,9 @@ static void spot_interactive(Object *ob, int mode)
 			mvalo[0]= mval[0];
 			mvalo[1]= mval[1];
 			
+			/* handle shaded mode */
+			shade_buttons_change_3d();
+
 			/* DRAW */	
 			headerprint(str);
 			force_draw_plus(SPACE_BUTS, 0);
@@ -2355,6 +2359,7 @@ static void spot_interactive(Object *ob, int mode)
 
 	allqueue(REDRAWVIEW3D, 0);
 	allqueue(REDRAWBUTSSHADING, 0);
+	BIF_preview_changed(ID_LA);
 }