diff --git a/README.md b/README.md
index 18a73b4..867a7f7 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ You have the following properties available to use with the directive.  All are
 * enableDate (true/false)
 * enableTime (true/false)
 * buttonBar (object)
+* initialPicker ('date'/'time')
+* reOpenDefault (false/'date'/'time') - NOTE: `true` not supported
 * dateDisabled
 * datepickerOptions (object)
 * timepickerOptions (object)
@@ -45,6 +47,10 @@ Whether you would like the user to be able to select a time. Defaults to true
 ##### buttonBar
 To show or hide the button bar, or any of the buttons inside it. Defaults to the uiDatetimePickerConfig.
 Only specify the elements that you want to override, as each button defaults to the uiDatetimePickerConfig setup, if it is not configured on scope of the datetimePicker
+##### initialPicker
+The initial picker to open when the control is first pressed
+##### reOpenDefault
+The picker to set as the picker to open once the control has already been opened at least once. Setting to `false` will default to the date picker if both date and time are enabled, or just the enabled control if only time or date is in use.
 ##### dateDisabled
 From angularUI site -> An optional expression to disable visible options based on passing date and current mode (day|month|year).
 ##### datepickerOptions
@@ -70,6 +76,8 @@ Now datetimePicker options are globally set by default.  If you do not state the
             'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
             'month': 'yyyy-MM'
         },
+        initialPicker: 'date',
+        reOpenDefault: false,
         enableDate: true,
         enableTime: true,
         buttonBar: {
diff --git a/datetime-picker.js b/datetime-picker.js
index fbd1688..40c2493 100644
--- a/datetime-picker.js
+++ b/datetime-picker.js
@@ -1,4 +1,4 @@
-angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
+angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .constant('uiDatetimePickerConfig', {
         dateFormat: 'yyyy-MM-dd HH:mm',
         defaultTime: '00:00:00',
@@ -7,6 +7,8 @@
             'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
             'month': 'yyyy-MM'
         },
+        initialPicker: 'date',
+        reOpenDefault: false,
         enableDate: true,
         enableTime: true,
         buttonBar: {
@@ -60,8 +62,19 @@
                 scope.enableDate = angular.isDefined(scope.enableDate) ? scope.enableDate : uiDatetimePickerConfig.enableDate;
                 scope.enableTime = angular.isDefined(scope.enableTime) ? scope.enableTime : uiDatetimePickerConfig.enableTime;
 
+                // determine default picker
+                scope.initialPicker = angular.isDefined(attrs.initialPicker) ? attrs.initialPicker : (scope.enableDate ? uiDatetimePickerConfig.initialPicker : 'time');
+
+                // determine the picker to open when control is re-opened
+                scope.reOpenDefault = angular.isDefined(attrs.reOpenDefault) ? attrs.reOpenDefault : uiDatetimePickerConfig.reOpenDefault;
+
+                // check if an illegal combination of options exists
+                if (scope.initialPicker == 'date' && !scope.enableDate) {
+                    throw new Error("datetimePicker can't have initialPicker set to date and have enableDate set to false.");
+                }
+
                 // default picker view
-                scope.showPicker = scope.enableDate ? 'date' : 'time';
+                scope.showPicker = !scope.enableDate ? 'time' : scope.initialPicker;
 
                 var isHtml5DateInput = false;
 
@@ -394,7 +407,7 @@
 
                 // if enableDate and enableTime are true, reopen the picker in date mode first
                 if (scope.enableDate && scope.enableTime)
-                    scope.showPicker = 'date';
+                    scope.showPicker = scope.reOpenDefault === false ? 'date' : scope.reOpenDefault;
 
                 // if a on-close-fn has been defined, lets call it
                 // we only call this if closePressed is defined!
@@ -531,6 +544,8 @@
                 isOpen: '=?',
                 enableDate: '=?',
                 enableTime: '=?',
+                initialPicker: '=?',
+                reOpenDefault: '=?',
                 dateDisabled: '&',
                 customClass: '&',
                 whenClosed: '&'
diff --git a/example/index.html b/example/index.html
index f70b516..5f548ad 100644
--- a/example/index.html
+++ b/example/index.html
@@ -7,7 +7,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/1.1.0/ui-bootstrap-tpls.js"></script>
     <script src="datetime-picker.js"></script>
-    <script src="script.js"></script>
+    <script src="index.js"></script>
 </head>
 <body style="padding:10px;" class="container-fluid">
 <h1>DateTime Picker Demo</h1>
@@ -266,6 +266,78 @@ <h3>Call function when closed</h3>
             </div>
         </div>
     </form>
+    <h3>Initial picker</h3>
+    <form class="form-horizontal">
+        <div class="form-group">
+            <label class="col-sm-2 control-label">Date</label>
+            <div class="col-sm-10">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date14" is-open="ctrl.open.date14" initial-picker="date"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date14')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">Time</label>
+            <div class="col-sm-10">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date16" is-open="ctrl.open.date16" initial-picker="time"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date16')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+    </form>
+    <h3>Initial picker with re-open default</h3>
+    <form class="form-horizontal">
+        <div class="form-group">
+            <label class="col-sm-6 control-label">Date on initial, date there after</label>
+            <div class="col-sm-6">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date17" is-open="ctrl.open.date17" initial-picker="date" re-open-default="date"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date17')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">Date on initial, time there after</label>
+            <div class="col-sm-6">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date18" is-open="ctrl.open.date18" initial-picker="date" re-open-default="time"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date18')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">Time on initial, time there after</label>
+            <div class="col-sm-6">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date19" is-open="ctrl.open.date19" initial-picker="time" re-open-default="time"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date19')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">Time on initial, date there after</label>
+            <div class="col-sm-6">
+                <p class="input-group">
+                    <input type="text" class="form-control" datetime-picker="dd/MM/yyyy HH:mm" ng-model="ctrl.dates.date15" is-open="ctrl.open.date15" initial-picker="time" re-open-default="date"/>
+              <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" ng-click="ctrl.openCalendar($event, 'date15')"><i class="fa fa-clock-o"></i></button>
+              </span>
+                </p>
+            </div>
+        </div>
+    </form>
 </div>
 </body>
 
diff --git a/example/index.js b/example/index.js
index cc49800..d6bbaa6 100644
--- a/example/index.js
+++ b/example/index.js
@@ -21,6 +21,12 @@ app.controller('MyController', ['$scope', function($scope) {
         date11: new Date('2015-03-01T10:00:00Z'),
         date12: new Date('2015-03-01T10:00:00Z'),
         date13: null,
+        date14: new Date('2016-02-16T10:00:00Z'),
+        date15: new Date('2016-02-16T10:00:00Z'),
+        date16: new Date('2016-02-16T10:00:00Z'),
+        date17: new Date('2016-02-16T10:00:00Z'),
+        date18: new Date('2016-02-16T10:00:00Z'),
+        date19: new Date('2016-02-16T10:00:00Z'),
     };
 
     this.open = {
@@ -36,7 +42,13 @@ app.controller('MyController', ['$scope', function($scope) {
         date10: false,
         date11: false,
         date12: false,
-        date13: false
+        date13: false,
+        date14: false,
+        date15: false,
+        date16: false,
+        date17: false,
+        date18: false,
+        date19: false
     };
 
     // Disable today selection