diff --git a/module/testcase/js/create.ui.js b/module/testcase/js/create.ui.js
index f558f86aea..34e80f80ab 100644
--- a/module/testcase/js/create.ui.js
+++ b/module/testcase/js/create.ui.js
@@ -35,12 +35,12 @@ function changeStory(event)
     if(storyID != '0')
     {
         const storyLink = $.createLink('story', 'view', 'storyID=' + storyID);
-        $('#preview').parent().removeClass('hidden');
+        $('#preview').removeClass('hidden');
         $('#preview').attr('href', storyLink);
     }
     else
     {
-        $('#preview').parent().addClass('hidden');
+        $('#preview').addClass('hidden');
     }
 }
 
diff --git a/module/testcase/ui/create.field.php b/module/testcase/ui/create.field.php
index b4902fcb04..a7f0bda52f 100644
--- a/module/testcase/ui/create.field.php
+++ b/module/testcase/ui/create.field.php
@@ -17,17 +17,21 @@ $fields->field('module')
     ->items(data('moduleOptionMenu'))
     ->value(data('currentModuleID'))
     ->manageLink(createLink('tree', 'browse', 'rootID=' . data('productID') . '&view=case&currentModuleID=0&branch=' . data('branch')))
+    ->required(true)
     ->controlEnd()
     ->wrapAfter(true);
 
 $fields->field('story')
     ->label($lang->testcase->lblStory)
-    ->items(data('stories'))
-    ->value(data('case.story'));
+    ->control('inputGroup')
+    ->items(false)
+    ->itemBegin('story')->control('picker')->id('story')->items(data('stories'))->value(data('case.story'))->itemEnd()
+    ->itemBegin()->control('btn', array('url' => helper::createLink('story', 'view', 'storyID=' . data('case.story')), 'data-toggle' => 'modal', 'data-size' => 'lg'))->className('hidden', empty(data('case.story')))->icon('eye text-primary')->hint($lang->preview)->id('preview')->itemEnd();
 
 $fields->field('scene')
     ->items(data('sceneOptionMenu'))
-    ->value(data('currentSceneID'));
+    ->value(data('currentSceneID'))
+    ->required(true);
 
 $fields->field('type')
     ->checkbox(array('id' => 'auto', 'name' => 'auto', 'text' => $lang->testcase->automated, 'checked' => data('case.auto') == 'auto'))
diff --git a/module/testcase/ui/create.html.php b/module/testcase/ui/create.html.php
index 5c99e76c9e..790fbf64e7 100644
--- a/module/testcase/ui/create.html.php
+++ b/module/testcase/ui/create.html.php
@@ -31,6 +31,7 @@ formGridPanel
     !empty($gobackLink) ? set::backUrl($gobackLink) : null,
     on::change('#scriptFile', 'readScriptContent'),
     on::change('#scriptFile', 'hideUploadScriptBtn'),
+    on::change('#story', 'changeStory'),
     on::click('#auto', 'checkScript'),
     on::click('.autoScript .file-delete', 'showUploadScriptBtn')
 );
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index 65b3306f9d..e49faf8b16 100755
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -409,7 +409,7 @@ class testcaseZen extends testcase
         $this->view->stories          = $stories;
         $this->view->currentModuleID  = $currentModuleID;
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, $branch === 'all' || !isset($branches[$branch]) ? '0' : $branch);
-        $this->view->sceneOptionMenu  = $this->testcase->getSceneMenu($productID, 0, $branch === 'all' || !isset($branches[$branch]) ? '0' : $branch);
+        $this->view->sceneOptionMenu  = $this->testcase->getSceneMenu($productID, $moduleID, $branch === 'all' || !isset($branches[$branch]) ? '0' : $branch);
     }
 
     /**