diff --git a/src/js/bootstrap-datetimepicker.js b/src/js/bootstrap-datetimepicker.js
index 591bf42a5..4d4a7db50 100644
--- a/src/js/bootstrap-datetimepicker.js
+++ b/src/js/bootstrap-datetimepicker.js
@@ -156,7 +156,6 @@
       this.widget.hide();
       this.viewMode = this.startViewMode;
       this.showMode();
-      this.set();
       this.$element.trigger({
         type: 'hide',
         date: this._date
@@ -630,6 +629,9 @@
                 this.fillDate();
                 this.set();
                 this.notifyChange();
+                if (this.options.autoClose) {
+                    this.hide();
+                }
               }
               break;
           }
@@ -1087,7 +1089,8 @@
     });
   };
 
-  $.fn.datetimepicker.defaults = {
+$.fn.datetimepicker.defaults = {
+    autoClose: false,
     maskInput: false,
     pickDate: true,
     pickTime: true,