diff --git a/modules/system/assets/ui/docs/popover.md b/modules/system/assets/ui/docs/popover.md
index 89ce8e75d..f34c1240c 100644
--- a/modules/system/assets/ui/docs/popover.md
+++ b/modules/system/assets/ui/docs/popover.md
@@ -18,7 +18,7 @@ You may add `data-control="popover"` to an anchor or button to activate a popove
 
 ### Template content
 
-Define the popover content as a template and reference it with `data-content="#myPopoverContent"`.
+Define the popover content as a template and reference it with `data-content-from="#myPopoverContent"`.
 
 ```html
 <script type="text/template" id="myPopoverContent">
@@ -47,7 +47,7 @@ Define the popover content as a template and reference it with `data-content="#m
         class="btn btn-primary"
         data-control="popover"
         data-width="200"
-        data-content="#myPopoverContent">
+        data-content-from="#myPopoverContent">
         Template popover
     </a>
 
@@ -98,6 +98,8 @@ Closes the popover. There are 3 ways to close the popover: call it's `hide()` me
 
 - `content`: content HTML string or callback
 
+- `contentFrom`: selector to source the content HTML
+
 - `width`: content width, optional. If not specified, the content width will be used.
 
 - `modal`: make the popover modal
diff --git a/modules/system/assets/ui/js/popover.js b/modules/system/assets/ui/js/popover.js
index 09db1b0cb..a49de2368 100644
--- a/modules/system/assets/ui/js/popover.js
+++ b/modules/system/assets/ui/js/popover.js
@@ -171,14 +171,12 @@
     }
 
     Popover.prototype.getContent = function () {
-        var content = this.options.content
-
-        if (typeof content == 'function') {
-            return content.call(this.$el[0], this)
+        if (this.options.contentFrom) {
+            return $(this.options.contentFrom).html()
         }
 
-        if (content.charAt(0) === '#') {
-            return $(content).html()
+        if (typeof this.options.content == 'function') {
+            return this.options.content.call(this.$el[0], this)
         }
 
         return this.options.content
@@ -319,6 +317,7 @@
         placement: 'bottom',
         fallbackPlacement: 'bottom',
         content: '<p>Popover content<p>',
+        contentFrom: null,
         width: false,
         modal: false,
         highlightModalTarget: false,
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 1b6cc4014..7d68f9c3c 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3440,9 +3440,8 @@ Popover.prototype.reposition=function(){var
 placement=this.calcPlacement(),position=this.calcPosition(placement)
 this.$container.removeClass('placement-center placement-bottom placement-top placement-left placement-right')
 this.$container.css({left:position.x,top:position.y}).addClass('placement-'+placement)}
-Popover.prototype.getContent=function(){var content=this.options.content
-if(typeof content=='function'){return content.call(this.$el[0],this)}
-if(content.charAt(0)==='#'){return $(content).html()}
+Popover.prototype.getContent=function(){if(this.options.contentFrom){return $(this.options.contentFrom).html()}
+if(typeof this.options.content=='function'){return this.options.content.call(this.$el[0],this)}
 return this.options.content}
 Popover.prototype.calcDimensions=function(){var
 documentWidth=$(document).width(),documentHeight=$(document).height(),targetOffset=this.$el.offset(),targetWidth=this.$el.outerWidth(),targetHeight=this.$el.outerHeight()
@@ -3490,7 +3489,7 @@ if(this.options.onCheckDocumentClickTarget&&this.options.onCheckDocumentClickTar
 if($.contains(this.$container.get(0),e.target))
 return
 this.hide();}
-Popover.DEFAULTS={placement:'bottom',fallbackPlacement:'bottom',content:'<p>Popover content<p>',width:false,modal:false,highlightModalTarget:false,closeOnPageClick:true,closeOnEsc:true,container:false,containerClass:null,offset:15,useAnimation:false,onCheckDocumentClickTarget:null}
+Popover.DEFAULTS={placement:'bottom',fallbackPlacement:'bottom',content:'<p>Popover content<p>',contentFrom:null,width:false,modal:false,highlightModalTarget:false,closeOnPageClick:true,closeOnEsc:true,container:false,containerClass:null,offset:15,useAnimation:false,onCheckDocumentClickTarget:null}
 var old=$.fn.ocPopover
 $.fn.ocPopover=function(option){var args=arguments;return this.each(function(){var $this=$(this)
 var data=$this.data('oc.popover')