diff --git a/directives/plugin.html b/directives/plugin.html
index 2bca14d..c0669bb 100644
--- a/directives/plugin.html
+++ b/directives/plugin.html
@@ -4,7 +4,7 @@
     Hide {{ plugin.name }}
   </button>
 
-  <div ng-bind-html="displayedContent"></div>
+  <div ng-bind-html="displayedContent" bo-class="plugin.$$hashKey"></div>
 </div>
 
 <div ng-hide="plugin.visible">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 1682cd0..3a4e49c 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -810,6 +810,15 @@ weechat.directive('plugin', function() {
                  */
                 $scope.displayedContent = $scope.plugin.content;
                 $scope.plugin.visible = true;
+
+                // Scroll embed content into view
+                var elems = $("." + $scope.plugin.$$hashKey);
+                if (elems.length == 1) {
+                    var scroll = function() {
+                        elems[0].scrollIntoViewIfNeeded();
+                    };
+                    setTimeout(scroll, 100);
+                }
             };
 
         }