diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index 8a84cb8060..1894fa7109 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -276,8 +276,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
 
       $scope.$emit('uib:datepicker.mode');
     }
-
-    $scope.$broadcast('uib:datepicker.focus');
+    
   };
 
   $scope.move = function(direction) {
diff --git a/template/datepicker/datepicker.html b/template/datepicker/datepicker.html
index 8e2d2eb806..ce53e53f9b 100644
--- a/template/datepicker/datepicker.html
+++ b/template/datepicker/datepicker.html
@@ -1,4 +1,4 @@
-<div ng-switch="datepickerMode">
+<div ng-switch="datepickerMode" contenteditable="true" ng-keydown="keydown($event)">
   <div uib-daypicker ng-switch-when="day" tabindex="0" class="uib-daypicker"></div>
   <div uib-monthpicker ng-switch-when="month" tabindex="0" class="uib-monthpicker"></div>
   <div uib-yearpicker ng-switch-when="year" tabindex="0" class="uib-yearpicker"></div>
diff --git a/template/datepickerPopup/popup.html b/template/datepickerPopup/popup.html
index 0af206a4a7..9cdd851bd8 100644
--- a/template/datepickerPopup/popup.html
+++ b/template/datepickerPopup/popup.html
@@ -1,4 +1,4 @@
-<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
+<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested contenteditable="true" ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
   <li ng-transclude></li>
   <li ng-if="showButtonBar" class="uib-button-bar">
     <span class="btn-group pull-left">