diff --git a/ui/editor.js b/ui/editor.js
index bdb7f9b7..20998c3c 100755
--- a/ui/editor.js
+++ b/ui/editor.js
@@ -21,7 +21,6 @@ var toggleEditor = createCSSClassToggler(
 					$('.viewer')
 						.append(makeEditorControls('.current.image')
 							//.draggable('option', 'snap', '.viewer')
-							.addClass('noScroll')
 							.css({
 								// prevent the editor from moving under 
 								// the title bar, that will prevent us from
diff --git a/ui/lib/editor.js b/ui/lib/editor.js
index 42cf6b63..07a2bf36 100755
--- a/ui/lib/editor.js
+++ b/ui/lib/editor.js
@@ -246,19 +246,22 @@ function makeLogRange(text, filter, target){
 }
 
 
-function makePanel(title, open){
+function makePanel(title, open, editable_title){
 	title = title == null ? ' ' : title
 
 	// tool panel...
 	var panel = $('<details/>')
 		.prop('open', open == null ? true : open)
-		.addClass('panel')
+		.addClass('panel noScroll')
 		.css({
 			position: 'absolute',
 			top: '100px',
 			left: '100px',
 		})
 		.append($('<summary>'+title+'</summary>')
+			.attr({
+				contenteditable: editable_title == null ? 'false' : 'true',
+			})
 			.append($('<span/>')
 				.addClass('close-button')
 				.click(function(){
@@ -282,6 +285,7 @@ function makePanel(title, open){
 				 ui.placeholder.width(ui.helper.outerWidth());
 			},
 			opacity: 0.7,
+			connectWith: '.panel-content',
 		})
 		.appendTo(panel)
 	return panel
@@ -292,6 +296,7 @@ function makeSubPanel(title, open, parent){
 	title = title == null ? '&nbsp;' : title
 
 	var sub_panel = $('<details/>')
+		.addClass('sub-panel noScroll')
 		.prop('open', open == null ? true : open)
 		.append($('<summary>'+title+'</summary>'))
 		.append($('<div class="sub-panel-content"/>'))