diff --git a/templates/repo/datasets/right_side.tmpl b/templates/repo/datasets/right_side.tmpl
index 8ee7fc716..adfaf4056 100644
--- a/templates/repo/datasets/right_side.tmpl
+++ b/templates/repo/datasets/right_side.tmpl
@@ -36,7 +36,12 @@
     <div class="filter menu">
       <input type="hidden" name="task" id="task" value="{{.dataset.Task}}">
       {{range $task := tasks}}
-        <a class="item" data-task-id="{{$task}}"> {{$.i18n.Tr (printf "dataset.task.%s" $task)}}</a>
+        <a class="item" data-task-id="{{$task}}">
+          {{if eq $task $.dataset.Task}}
+            <span class="octicon-check">{{svg "octicon-check" 16}}</span>
+          {{end}}
+          {{$.i18n.Tr (printf "dataset.task.%s" $task)}}
+        </a>
       {{end}}
     </div>
   </div>
@@ -56,7 +61,12 @@
     <div class="filter menu">
       <input type="hidden" name="license" id="license" value="{{.dataset.License}}">
       {{range $license := licenses}}
-        <a class="item" data-license-id="{{$license}}"> {{$license}}</a>
+        <a class="item" data-license-id="{{$license}}">
+          {{if eq $license $.dataset.License}}
+            <span class="octicon-check">{{svg "octicon-check" 16}}</span>
+          {{end}}
+          {{$license}}
+        </a>
       {{end}}
     </div>
   </div>
diff --git a/web_src/less/_dataset.less b/web_src/less/_dataset.less
index 1e591c51d..c69432823 100644
--- a/web_src/less/_dataset.less
+++ b/web_src/less/_dataset.less
@@ -151,6 +151,9 @@
   }
 }
 .dataset-list {
+  .octicon-check {
+    padding-right: 8px;;
+  }
   .hide {
     display: none;
   }