Index: branches/5.0.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -r12298 -r12320
--- branches/5.0.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 12298)
+++ branches/5.0.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 12320)
@@ -144,7 +144,7 @@
 		eval(RegExp.$1);
 	}
 	else {
-		window.location.href = RegExp.$1;
+		window.location.href = $translate_url;
 	}
 
 	return false;
@@ -218,7 +218,7 @@
 	var $block_info = this._blocks[$id];
 	var $url = this._editUrl.replace('#BLOCK#', $block_info.block_name + ':' + $block_info.function_name).replace('#EVENT#', 'OnLoadBlock');
 
-	openSelector('theme-file', $url);
+	direct_edit('theme-file', $url);
 
 	$e.stopPropagation();
 }