diff --git a/templates/web/prod/Baskets/Create.html.twig b/templates/web/prod/Baskets/Create.html.twig
index 4895714cbd..5ba4b82cd1 100644
--- a/templates/web/prod/Baskets/Create.html.twig
+++ b/templates/web/prod/Baskets/Create.html.twig
@@ -1,21 +1,26 @@
 <form method="POST" action="/prod/baskets/">
 
-  <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
-  <input type="checkbox" id="bask_create_sel" name="lst" value=""/>
-
   <label>{% trans 'Nom du nouveau panier' %}</label>
   <input name="name" value="" type="text"/>
 
   <label>{% trans 'paniers::description du nouveau panier' %}</label>
   <textarea name="description"></textarea>
 
-  <button>{% trans 'boutton::valider' %}</button>
+  <input type="checkbox" name="lst" value=""/>
+  <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
 
   <script type="text/javascript">
     $(document).ready(function(){
-      $('#bask_create_sel').val(p4.Results.Selection.serialize());
+      
+      var $dialog = p4.Dialog.getDialog();
+      
+      $('input[name="lst"]', $dialog).val(p4.Results.Selection.serialize());
+      
+      var buttons = $dialog.dialog('option', 'buttons');
+      buttons[language.create] = function(){$('form', $dialog).trigger('submit')};
+      $dialog.dialog('option', 'buttons', buttons);
 
-      $('#DIALOG form').bind('submit', function(event){
+      $('form', $dialog).bind('submit', function(event){
 
         //$this.SetLoader(true);
 
@@ -32,7 +37,7 @@
           success: function(data){
 
             p4.WorkZone.refresh(data.basket.id);
-            $('#DIALOG').dialog('close').empty();
+            p4.Dialog.Close();
 
             return;
           },
diff --git a/templates/web/prod/Story/Create.html.twig b/templates/web/prod/Story/Create.html.twig
index 136835535a..a2b37cd629 100644
--- a/templates/web/prod/Story/Create.html.twig
+++ b/templates/web/prod/Story/Create.html.twig
@@ -1,30 +1,32 @@
 <form method="POST" action="/prod/story/">
 
-  <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
-  <input type="checkbox" id="story_create_sel" name="lst" value=""/>
-
-  <label>{% trans 'Story name' %}</label>
-  <input name="name" value="" type="text"/>
-
-  <label>{% trans 'Story description' %}</label>
-  <textarea name="description"></textarea>
-
   <label>{% trans 'Collection' %}</label>
   <select name="base_id">
     {% for collection in user.ACL().get_granted_base(['canaddrecord']) %}
      <option value="{{ collection.get_base_id() }}">{{ collection.get_databox().get_viewname() }} / {{ collection.get_name() }}</option>
     {% endfor %}
   </select>
+  
+  <label>{% trans 'Story name' %}</label>
+  <input name="name" value="" type="text"/>
 
-  <button>{% trans 'boutton::valider' %}</button>
+  <label>{% trans 'Story description' %}</label>
+  <textarea name="description"></textarea>
+
+  <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
+  <input type="checkbox" name="lst" value=""/>
 
   <script type="text/javascript">
     $(document).ready(function(){
-      $('#story_create_sel').val(p4.Results.Selection.serialize());
+      var $dialog = p4.Dialog.getDialog();
 
-      $('#DIALOG form').bind('submit', function(event){
-
-        //$this.SetLoader(true);
+      $('input[name="lst"]', $dialog).val(p4.Results.Selection.serialize());
+      
+      var buttons = $dialog.dialog('option', 'buttons');
+      buttons[language.create] = function(){$('form', $dialog).trigger('submit')};
+      $dialog.dialog('option', 'buttons', buttons);
+      
+      $('form', $dialog).bind('submit', function(event){
 
         var $form = $(this);
 
@@ -39,7 +41,7 @@
           success: function(data){
 
             p4.WorkZone.refresh(data.basket.id);
-            $('#DIALOG').dialog('close').empty();
+            p4.Dialog.Close();
 
             return;
           },
diff --git a/templates/web/prod/WorkZone/Macros.twig b/templates/web/prod/WorkZone/Macros.twig
index a1fa269af6..bcafc7ea49 100644
--- a/templates/web/prod/WorkZone/Macros.twig
+++ b/templates/web/prod/WorkZone/Macros.twig
@@ -53,7 +53,7 @@
                       </div>
                       <div title="" class="context-menu-item">
                         <div class="context-menu-item-inner">
-                          <a class="dialog" title="{% trans 'action::renommer' %}" href="/prod/baskets/{{basket.getId()}}/update/">
+                          <a class="dialog small-dialog" title="{% trans 'action::renommer' %}" href="/prod/baskets/{{basket.getId()}}/update/">
                             {% trans 'action::renommer' %}
                           </a>
                         </div>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 76c3dab3dd..0b8e4a9c3b 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -525,7 +525,7 @@
       <ul style="list-style-type:none;margin:0;padding:0">
         <li class="context-menu-item">
           <div class="context-menu-item-inner"@>
-            <a title="{% trans 'action:: nouveau panier' %}" class="dialog" href="/prod/baskets/create/">
+            <a title="{% trans 'action:: nouveau panier' %}" class="dialog small-dialog" href="/prod/baskets/create/">
               <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau panier' %}" />
               {% trans 'action:: nouveau panier' %}
             </a>
@@ -536,7 +536,7 @@
             </a>
           </div>
           <div class="context-menu-item-inner"@>
-            <a title="{% trans 'action:: nouveau reportage' %}" class="dialog" href="/prod/story/create/">
+            <a title="{% trans 'action:: nouveau reportage' %}" class="dialog small-dialog" href="/prod/story/create/">
               <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau reportage' %}" />
               {% trans 'action:: nouveau reportage' %}
             </a>