diff --git a/src/popover/popover.js b/src/popover/popover.js
index f6d027511f..d64e729eff 100644
--- a/src/popover/popover.js
+++ b/src/popover/popover.js
@@ -12,7 +12,7 @@ angular.module( 'ui.bootstrap.popover', [] )
     templateUrl: 'template/popover/popover.html'
   };
 })
-.directive( 'popover', [ '$compile', '$timeout', '$parse', function ( $compile, $timeout, $parse ) {
+.directive( 'popover', [ '$compile', '$timeout', '$parse', '$window', function ( $compile, $timeout, $parse, $window ) {
   
   var template = 
     '<popover-popup '+
@@ -52,15 +52,15 @@ angular.module( 'ui.bootstrap.popover', [] )
       
       // Calculate the current position and size of the directive element.
       function getPosition() {
+        var boundingClientRect = element[0].getBoundingClientRect();
         return {
           width: element.prop( 'offsetWidth' ),
           height: element.prop( 'offsetHeight' ),
-          top: element.prop( 'offsetTop' ),
-          left: element.prop( 'offsetLeft' )
+          top: boundingClientRect.top + $window.pageYOffset,
+          left: boundingClientRect.left + $window.pageXOffset
         };
       }
-      
-      // Show the popover popup element.
+
       function show() {
         var position,
             ttWidth,
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
index d8061819b7..a4db609589 100644
--- a/src/tooltip/tooltip.js
+++ b/src/tooltip/tooltip.js
@@ -12,7 +12,7 @@ angular.module( 'ui.bootstrap.tooltip', [] )
     templateUrl: 'template/tooltip/tooltip-popup.html'
   };
 })
-.directive( 'tooltip', [ '$compile', '$timeout', '$parse', function ( $compile, $timeout, $parse ) {
+.directive( 'tooltip', [ '$compile', '$timeout', '$parse', '$window', function ( $compile, $timeout, $parse, $window) {
   
   var template = 
     '<tooltip-popup '+
@@ -47,11 +47,12 @@ angular.module( 'ui.bootstrap.tooltip', [] )
       
       // Calculate the current position and size of the directive element.
       function getPosition() {
+        var boundingClientRect = element[0].getBoundingClientRect();
         return {
           width: element.prop( 'offsetWidth' ),
           height: element.prop( 'offsetHeight' ),
-          top: element.prop( 'offsetTop' ),
-          left: element.prop( 'offsetLeft' )
+          top: boundingClientRect.top + $window.pageYOffset,
+          left: boundingClientRect.left + $window.pageXOffset
         };
       }
       
@@ -82,7 +83,8 @@ angular.module( 'ui.bootstrap.tooltip', [] )
         
         // Get the position of the directive element.
         position = getPosition();
-        
+        console.log(position);
+
         // Get the height and width of the tooltip so we can center it.
         ttWidth = tooltip.prop( 'offsetWidth' );
         ttHeight = tooltip.prop( 'offsetHeight' );