diff --git a/scss/_popover.scss b/scss/_popover.scss
index 779b58082e22dff73f785d871c88c8fd14b9815e..3ef5f628bdec02858d22a7d732459f58ae7c1e50 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -14,7 +14,7 @@
   background-color: $popover-bg;
   background-clip: padding-box;
   border: $popover-border-width solid $popover-border-color;
-  @include border-radius($border-radius-lg);
+  @include border-radius($popover-border-radius);
   @include box-shadow($popover-box-shadow);
 
   .arrow {
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index 7f6a26f75a647f6e85aceb233d0a1f2df103e2d7..1286ebfcf9038a8c0e1535f498a47c98407bb149 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -111,5 +111,5 @@
   color: $tooltip-color;
   text-align: center;
   background-color: $tooltip-bg;
-  @include border-radius($border-radius);
+  @include border-radius($tooltip-border-radius);
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index afd05e432063d8bd48ed640b5891871182e75685..b99b477fb0e3922bb52f2e779358eb7417fbb26f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -671,6 +671,7 @@ $tooltip-font-size:           $font-size-sm !default;
 $tooltip-max-width:           200px !default;
 $tooltip-color:               $white !default;
 $tooltip-bg:                  $black !default;
+$tooltip-border-radius:        $border-radius !default;
 $tooltip-opacity:             .9 !default;
 $tooltip-padding-y:           .25rem !default;
 $tooltip-padding-x:           .5rem !default;
@@ -688,6 +689,7 @@ $popover-bg:                        $white !default;
 $popover-max-width:                 276px !default;
 $popover-border-width:              $border-width !default;
 $popover-border-color:              rgba($black, .2) !default;
+$popover-border-radius:             $border-radius-lg !default;
 $popover-box-shadow:                0 .25rem .5rem rgba($black, .2) !default;
 
 $popover-header-bg:                 darken($popover-bg, 3%) !default;