diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index f960ab1744..f96384aaa9 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -381,7 +381,7 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
 
       element.bind('input change keyup', function() {
         scope.$apply(function() {
-          updateCalendar();
+          scope.date = ngModel.$modelValue;
         });
       });
 
@@ -389,14 +389,8 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
       ngModel.$render = function() {
         var date = ngModel.$viewValue ? dateFilter(ngModel.$viewValue, dateFormat) : '';
         element.val(date);
-
-        updateCalendar();
-      };
-
-      function updateCalendar() {
         scope.date = ngModel.$modelValue;
-        updatePosition();
-      }
+      };
 
       function addWatchableAttribute(attribute, scopeProperty, datepickerAttribute) {
         if (attribute) {
diff --git a/src/datepicker/docs/demo.html b/src/datepicker/docs/demo.html
index 37c891759a..bb96932541 100644
--- a/src/datepicker/docs/demo.html
+++ b/src/datepicker/docs/demo.html
@@ -2,15 +2,17 @@
     <pre>Selected date is: <em>{{dt | date:'fullDate' }}</em></pre>
 
     <h4>Inline</h4>
-    <div class="well well-small" ng-model="dt" style="display:inline-block;">
-        <datepicker min="minDate" show-weeks="showWeeks"></datepicker>
+    <div style="display:inline-block; min-height:290px;">
+      <div class="well well-small" ng-model="dt">
+          <datepicker min="minDate" show-weeks="showWeeks"></datepicker>
+      </div>
     </div>
 
     <h4>Popup</h4>
     <div class="form-horizontal">
         <p>
             <input type="text" datepicker-popup="{{format}}" ng-model="dt" is-open="opened" min="minDate" max="'2015-06-22'" datepicker-options="dateOptions" date-disabled="disabled(date, mode)" ng-required="true" close-text="Close" />
-            <button class="btn" ng-click="open()"><i class="icon-calendar"></i></button>
+            <button class="btn" ng-click="open($event)"><i class="icon-calendar"></i></button>
         </p>
         <p><i>Format options:</i> <select ng-model="format" ng-options="f for f in formats"><option></option></select></p>
     </div>
diff --git a/src/datepicker/docs/demo.js b/src/datepicker/docs/demo.js
index 6b2e445bf5..f8a83f8221 100644
--- a/src/datepicker/docs/demo.js
+++ b/src/datepicker/docs/demo.js
@@ -1,4 +1,4 @@
-var DatepickerDemoCtrl = function ($scope, $timeout) {
+var DatepickerDemoCtrl = function ($scope) {
   $scope.today = function() {
     $scope.dt = new Date();
   };
@@ -23,10 +23,11 @@ var DatepickerDemoCtrl = function ($scope, $timeout) {
   };
   $scope.toggleMin();
 
-  $scope.open = function() {
-    $timeout(function() {
-      $scope.opened = true;
-    });
+  $scope.open = function($event) {
+    $event.preventDefault();
+    $event.stopPropagation();
+
+    $scope.opened = true;
   };
 
   $scope.dateOptions = {