diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index 1a4f3dfa37b..1a02838a20b 100644
--- a/source/blender/src/header_image.c
+++ b/source/blender/src/header_image.c
@@ -342,8 +342,7 @@ void do_image_buttons(unsigned short event)
 		if (ima) {
 			strcpy(name, ima->name);
 			if (ima->ibuf) {
-				save_image_filesel_str(str);
-				activate_fileselect(FILE_SPECIAL, str, name, save_paint);
+				activate_fileselect(FILE_SPECIAL, "Save in same type", name, save_paint);
 			}
 		}
 		break;
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 696e60aeb3d..29b403a359d 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -288,7 +288,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco,
 				if(browse==B_WORLDBROWSE) {
 					id= G.main->world.first;
 				}
-				else if(ob && ob->type && (ob->type<OB_LAMP)) {
+				else if(ob && ob->type && (ob->type<=OB_LAMP)) {
 					if(G.buts->mainb==CONTEXT_SHADING) {
 						int tab= G.buts->tab[CONTEXT_SHADING];