diff --git a/skins/default/functions.js b/skins/default/functions.js
index 349782627..e48203eea 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -37,7 +37,7 @@ function rcube_init_tabs(id, current)
   fs.each(function(idx) { if (idx != current) $(this).hide(); });
 
   // create tabs container
-  var tabs = $('<div>').addClass('tabsbar').appendTo($(content));
+  var tabs = $('<div>').addClass('tabsbar').appendTo(content);
 
   // convert fildsets into tabs
   fs.each(function(idx) {
diff --git a/skins/default/templates/folderedit.html b/skins/default/templates/folderedit.html
index 78ddd335e..c5fa2490f 100644
--- a/skins/default/templates/folderedit.html
+++ b/skins/default/templates/folderedit.html
@@ -18,7 +18,7 @@
     <roundcube:button command="save" type="input" class="button mainaction" label="save" />
   </p>
 </div>
-<script type="text/javascript">rcube_init_tabs('folder-details')</script>
+<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
 
 </body>
 </html>