diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
index e3ee5253023..c4f004b3a0b 100644
--- a/course/yui/toolboxes/toolboxes.js
+++ b/course/yui/toolboxes/toolboxes.js
@@ -618,6 +618,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
             // Get the element we're working on
             var activityid = Y.Moodle.core_course.util.cm.getId(activity),
                 instancename  = activity.one(SELECTOR.INSTANCENAME),
+                instance = activity.one(SELECTOR.ACTIVITYINSTANCE),
                 currenttitle = instancename.get('firstChild'),
                 oldtitle = currenttitle.get('data'),
                 titletext = oldtitle,
@@ -657,18 +658,14 @@ YUI.add('moodle-course-toolboxes', function(Y) {
                 editform.appendChild(activity.one(SELECTOR.ACTIVITYICON).cloneNode());
                 editform.appendChild(editor);
                 editform.setData('anchor', anchor);
+                instance.insert(editinstructions, 'before');
                 anchor.replace(editform);
-                activity.one('div').appendChild(editinstructions);
 
                 // Force the editing instruction to match the mod-indent position.
                 var padside = 'left';
                 if (right_to_left()) {
                     padside = 'right';
                 }
-                var mi = activity.one('.mod-indent'),
-                    instructionpad = parseInt(mi.getStyle('padding-' + padside), 10) +
-                            parseInt(mi.getStyle('margin-' + padside), 10);
-                editinstructions.setStyle('margin-' + padside, instructionpad + 'px');
 
                 // We hide various components whilst editing:
                 activity.addClass(CSS.EDITINGTITLE);
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index a567fc4dfaa..e7cc6f98def 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -319,7 +319,6 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
 span.editinstructions {
     position: absolute;
     top: 0px;
-    left: 0px;
     margin-top: -22px;
     margin-left: 30px;
     line-height: 16px;