diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c
index 787167ca038..30a01e676d9 100644
--- a/source/blender/src/editoops.c
+++ b/source/blender/src/editoops.c
@@ -111,6 +111,7 @@ static void oops_to_select_objects(void)
 	while(base) {
 		if(base->flag != base->object->flag) {
 			base->flag= base->object->flag;
+			set_active_base(base);
 		}
 		base= base->next;
 	}
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 896f9d8c81c..458dabc1cda 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -3560,6 +3560,14 @@ void winqreadoopsspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			transform_oops('s');
 		}
 		break;
+	case PKEY:
+		if((G.qual==LR_CTRLKEY)) {
+			make_parent();
+		} else if((G.qual==LR_ALTKEY)) {
+			clear_parent();
+		}
+		break;
+
 
 	case ONEKEY:
 		do_layer_buttons(0); break;