diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 97709e3cb..90f98f9fa 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -1339,9 +1339,10 @@ class rcube_sieve_engine
         $out = $hiddenfields->show();
 
         $txtarea = new html_textarea(array(
-                'id'   => 'rawfiltersettxt',
-                'name' => 'rawsetcontent',
-                'rows' => '15'
+                'id'    => 'rawfiltersettxt',
+                'name'  => 'rawsetcontent',
+                'class' => 'form-control',
+                'rows'  => '15'
         ));
 
         $out .= $txtarea->show($script_post !== null ? $script_post : ($script !== false ? rtrim($script) : ''));
@@ -1364,7 +1365,7 @@ class rcube_sieve_engine
                 'enctype' => 'multipart/form-data',
             ), $out);
 
-        return $attrib['close-form'] ? $out : str_replace('/</form>', '', $out);
+        return str_replace('</form>', '', $out);
     }
 
     function filterset_form($attrib)
diff --git a/plugins/managesieve/skins/elastic/templates/managesieve.html b/plugins/managesieve/skins/elastic/templates/managesieve.html
index 97f90ad9b..fd2ca8734 100644
--- a/plugins/managesieve/skins/elastic/templates/managesieve.html
+++ b/plugins/managesieve/skins/elastic/templates/managesieve.html
@@ -63,7 +63,7 @@
 	<ul class="toolbarmenu listing" id="filtersetmenu-menu" role="menu" aria-labelledby="aria-label-setactions">
 		<roundcube:button type="link-menuitem" command="plugin.managesieve-setadd" label="managesieve.filtersetadd" class="create" classAct="create active" />
 		<roundcube:if condition="env:raw_sieve_editor != false" />
-			<roundcube:button type="link-menuitem" command="plugin.managesieve-seteditraw" label="managesieve.filterseteditraw" class="edit" classAct="edit active" data-hidden="small" />
+			<roundcube:button type="link-menuitem" command="plugin.managesieve-seteditraw" label="managesieve.filterseteditraw" class="edit" classAct="edit active" />
 		<roundcube:endif />
 		<roundcube:button type="link-menuitem" command="plugin.managesieve-setact" label="managesieve.filtersetswitch" class="status" classAct="status active" />
 		<roundcube:button type="link-menuitem" command="plugin.managesieve-setdel" label="managesieve.filtersetdel" class="delete" classAct="delete active" />
diff --git a/plugins/managesieve/skins/elastic/templates/seteditraw.html b/plugins/managesieve/skins/elastic/templates/seteditraw.html
index 96b34cea8..eacdd7ebc 100644
--- a/plugins/managesieve/skins/elastic/templates/seteditraw.html
+++ b/plugins/managesieve/skins/elastic/templates/seteditraw.html
@@ -2,8 +2,8 @@
 
 <h1 class="voice"><roundcube:label name="managesieve.filterseteditraw" /></h1>
 
-<div class="formcontent">
-	<roundcube:object name="filterseteditraw" class="propform raweditor" />
+<div class="formcontent raweditor">
+	<roundcube:object name="filterseteditraw" /></form>
 </div>
 
 <div class="formbuttons">