diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 4c32979869..2730b9645d 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -145,20 +145,21 @@ function initSteps(selector)
     var insertStepRow = function($row, count, type, notFocus)
     {
         if(count === undefined) count = 1;
+        var $step;
         for(var i = 0; i < count; ++i)
         {
-            var $step = $stepTemplate.clone();
+            $step = $stepTemplate.clone();
             if($row) $row.after($step);
             else $steps.append($step);
             $step.addClass('step-new');
-            if(type) $step.find('step-type').val(type);
-            if(!notFocus) setTimeout(function(){$step.find('.step-steps').focus();}, 10);
+            if(type) $step.find('.step-type').val(type);
         }
+        if(!notFocus && $step) setTimeout(function(){$step.find('.step-steps').focus();}, 10);
     };
     var updateStepType = function($step, type)
     {
         var targetIsGroup = type =='group';
-        $step.attr('data-type', type).find('.step-steps').toggleClass('autosize', !targetIsGroup).attr('placeholder', targetIsGroup ? groupNameText : null).focus();
+        $step.attr('data-type', type).find('.step-steps').toggleClass('autosize', !targetIsGroup).attr('placeholder', targetIsGroup ? groupNameText : null);
     };
     var getStepsElements = function()
     {
@@ -277,7 +278,8 @@ function initSteps(selector)
             var $step = $control.closest('.step');
             if($step.data('index') === getStepsElements().length)
             {
-                insertStepRow($step, 1, 'step', false);
+                insertStepRow($step, 1, 'step', true);
+                if($step.is('.step-item,.step-group')) insertStepRow($step, 1, 'item', true);
                 refreshSteps();
             }
         }
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 7cb8a42c9e..a5f07f7178 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -147,16 +147,16 @@
                     <textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
                     <span class="input-group-addon step-type-toggle">
                       <input type='hidden' name='stepType[]' value='item' class='step-type'>
-                      <label class="checkbox-inline"><input type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
+                      <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
                     </span>
                   </div>
                 </td>
                 <td><textarea rows='1' class='form-control autosize step-expects' name='expects[]'></textarea></td>
                 <td class='step-actions'>
                   <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete'><i class='icon icon-remove'></i></button>
+                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
                   </div>
                 </td>
               </tr>
@@ -170,16 +170,16 @@
                     <span class='input-group-addon step-type-toggle'>
                       <?php if(!isset($step->type)) $step->type = 'step';?>
                       <input type='hidden' name='stepType[]' value='<?php echo $step->type;?>' class='step-type'>
-                      <label class="checkbox-inline"><input type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
+                      <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
                     </span>
                   </div>
                 </td>
                 <td><?php echo html::textarea('expects[]', $step->expect, "rows='1' class='form-control autosize step-expects'") ?></td>
                 <td class='step-actions'>
                   <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete'><i class='icon icon-remove'></i></button>
+                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
                   </div>
                 </td>
               </tr>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index f51f03b73e..fcc930ee1c 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -60,23 +60,16 @@
                     <textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
                     <span class="input-group-addon step-type-toggle">
                       <input type='hidden' name='stepType[]' value='item' class='step-type'>
-                      <div class='step-type-menu-box'>
-                        <div class='step-type-current'><span></span> <i class='caret'></i></div>
-                        <div class='step-type-menu'>
-                          <a href='javascript:;' href='step-type-option' data-value='step'><?php echo $lang->testcase->step ?></a>
-                          <a href='javascript:;' href='step-type-option' data-value='group'><?php echo $lang->testcase->group ?></a>
-                          <a href='javascript:;' href='step-type-option' data-value='item'><?php echo $lang->testcase->stepChild ?></a>
-                        </div>
-                      </div>
+                      <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
                     </span>
                   </div>
                 </td>
                 <td><textarea rows='1' class='form-control autosize step-expects' name='expects[]'></textarea></td>
                 <td class='step-actions'>
                   <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete'><i class='icon icon-remove'></i></button>
+                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
                   </div>
                 </td>
               </tr>
@@ -89,24 +82,17 @@
                     <?php echo html::textarea('steps[]', $step->desc, "rows='1' class='form-control autosize step-steps'") ?>
                     <span class='input-group-addon step-type-toggle'>
                       <?php if(!isset($step->type)) $step->type = 'step';?>
-                      <input type='hidden' name='stepType[]' value='<?php echo $step->type ?>' class='step-type'>
-                      <div class='step-type-menu-box'>
-                        <div class='step-type-current'><span></span> <i class='caret'></i></div>
-                        <div class='step-type-menu'>
-                          <a href='javascript:;' href='step-type-option' data-value='step'><?php echo $lang->testcase->step ?></a>
-                          <a href='javascript:;' href='step-type-option' data-value='group'><?php echo $lang->testcase->group ?></a>
-                          <a href='javascript:;' href='step-type-option' data-value='item'><?php echo $lang->testcase->stepChild ?></a>
-                        </div>
-                      </div>
+                      <input type='hidden' name='stepType[]' value='<?php echo $step->type;?>' class='step-type'>
+                      <label class="checkbox-inline"><input tabindex='-1' tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
                     </span>
                   </div>
                 </td>
                 <td><?php echo html::textarea('expects[]', $step->expect, "rows='1' class='form-control autosize step-expects'") ?></td>
                 <td class='step-actions'>
                   <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete'><i class='icon icon-remove'></i></button>
+                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
                   </div>
                 </td>
               </tr>