diff --git a/module/product/js/browse.ui.js b/module/product/js/browse.ui.js
index de05715729..594f386398 100644
--- a/module/product/js/browse.ui.js
+++ b/module/product/js/browse.ui.js
@@ -65,7 +65,7 @@ window.renderCell = function(result, info)
         if(story.parent > 0) if($.cookie.get('tab') == 'project') html += story.parentName + ' / ';
 
         let gradeLabel = gradeGroup[story.type][story.grade];
-        if(!showGrade && story.grade < 2) gradeLabel = '';
+        if(!showGrade && story.grade < 2 && storyType == story.type) gradeLabel = '';
         if(gradeLabel) html += "<span class='label gray-pale rounded-xl clip'>" + gradeLabel + "</span> ";
         if(story.color) result[0].props.style = 'color: ' + story.color;
         if(html) result.unshift({html});
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index f7af9b99aa..3031334803 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -18,6 +18,7 @@ jsVar('URChanged', $this->lang->story->URChanged);
 jsVar('gradeGroup', $gradeGroup);
 jsVar('showGrade', $showGrade);
 jsVar('oldShowGrades', $showGrades);
+jsVar('storyType', $storyType);
 
 $storyCommon       = $storyType == 'requirement' ? $lang->URCommon : $lang->SRCommon;
 $isProjectStory    = $this->app->rawModule == 'projectstory';
@@ -320,7 +321,7 @@ if($isProjectStory and $storyType == 'requirement')
 $queryMenuLink = createLink($app->rawModule, $app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=bySearch&param={queryID}");
 featureBar
 (
-    $showGrade ? to::leading
+    ($showGrade || $storyType != 'story') ? to::leading
     (
         picker
         (
diff --git a/module/product/zen.php b/module/product/zen.php
index c32e5b8fe4..0c74945a83 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -1470,7 +1470,7 @@ class productZen extends product
         $this->view->project         = $project;
         $this->view->stories         = $stories;
         $this->view->gradeGroup      = $gradeGroup;
-        $this->view->showGrade       = count($gradeGroup[$storyType]) > 1;
+        $this->view->showGrade       = count($gradeGroup[$storyType]) > 2;
         $this->view->gradeMenu       = $this->loadModel('story')->getGradeMenu($storyType);
         $this->view->showGrades      = isset($this->config->{$storyType}->showGrades) ? $this->config->{$storyType}->showGrades : $this->story->getDefaultShowGrades($this->view->gradeMenu);
         $this->view->storyType       = $storyType;
diff --git a/module/story/model.php b/module/story/model.php
index d75e31435d..94772fa53b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5011,6 +5011,8 @@ class storyModel extends model
     {
         $grades = $this->getGradePairs($storyType);
 
+        if($this->config->edition == 'open') return false;
+
         return count($grades) > 1;
     }