diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index cc7ad5fb0056f40d84b21700a0e35db271752f19..edc28954aaff0ff9c4be6ab22de41e7595f177a8 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -1,12 +1,13 @@
 class @DueDateSelect
   constructor: ->
+    $loading = $('.js-issuable-update .due_date').find('.block-loading').hide()
+
     $('.js-due-date-select').each (i, dropdown) ->
       $dropdown = $(dropdown)
       $dropdownParent = $dropdown.closest('.dropdown')
       $addBtn = $('.js-due-date-add', $dropdownParent)
       $datePicker = $dropdownParent.find('.js-due-date-calendar')
       $block = $dropdown.closest('.block')
-      $loading = $block.find('.block-loading').hide()
       $selectbox = $dropdown.closest('.selectbox')
       $value = $block.find('.value')
 
@@ -14,6 +15,12 @@ class @DueDateSelect
       abilityName = $dropdown.data('ability-name')
       issueUpdateURL = $dropdown.data('issue-update')
 
+      $dropdown.glDropdown(
+        hidden: ->
+          $selectbox.hide()
+          $value.removeAttr('style')
+      )
+
       $addBtn.on 'click', (e) ->
         e.preventDefault()
         e.stopPropagation()