diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index bc7a0208..e2e07e96 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -46,7 +46,7 @@ $(document).ready(function () {
       show: function(plugin, msg) {
         $('.installed-results .'+plugin+' .progress').show()
         $('.installed-results .'+plugin+' .progress .message').text(msg)
-        $(window).scrollTop($('.'+plugin).offset().top-100)
+        if($(window).scrollTop() > $('.'+plugin).offset().top)$(window).scrollTop($('.'+plugin).offset().top-100)
       },
       hide: function(plugin) {
         $('.installed-results .'+plugin+' .progress').hide()
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 1b69549c..44e6f7a5 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -59,7 +59,7 @@
           <tbody class="messages">
               <tr><td></td><td>
                 <p class="nothing-installed">You haven't installed any plugins yet.</p>
-                <p class="fetching">Fetching installed plugins...</p>
+                <p class="fetching"><img src="../static/img/loading.gif"/><br/>Fetching installed plugins...</p>
               </td><td></td></tr>
             </tbody>
         </table>
@@ -100,7 +100,7 @@
               <tr><td></td><td>
                 <div class="search-progress" class="progress"><img src="../static/img/loading.gif"/></div>
                 <p class="nothing-found">No plugins found.</p>
-                <p class="fetching">Fetching catalogue...</p>
+                <p class="fetching"><img src="../static/img/loading.gif"/><br/>Fetching catalogue...</p>
               </td><td></td></tr>
             </tbody>
           </table>