diff --git a/scss/_popover.scss b/scss/_popover.scss
index 9ea8c14758..6e6fe3c9cb 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -5,7 +5,7 @@
   z-index: $zindex-popover;
   display: block;
   max-width: $popover-max-width;
-  padding: 1px;
+  padding: $popover-inner-padding;
   // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
   // So reset our font and text properties to avoid inheriting weird values.
   @include reset-text();
@@ -112,6 +112,10 @@
   border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);
   $offset-border-width: ($border-width / $font-size-root);
   @include border-radius(($border-radius-lg - $offset-border-width) ($border-radius-lg - $offset-border-width) 0 0);
+
+  &:empty {
+    display: none;
+  }
 }
 
 .popover-content {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d50d8e281e..d129f9fee4 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -606,6 +606,7 @@ $tooltip-arrow-color:         $tooltip-bg !default;
 
 // Popovers
 
+$popover-inner-padding:               1px !default;
 $popover-bg:                          #fff !default;
 $popover-max-width:                   276px !default;
 $popover-border-width:                $border-width !default;