diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 19578bee8..500e3f2dc 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -586,19 +586,23 @@ function expandScmEntry(id) {
 
 function scmEntryClick(id, url) {
     var el = $('#'+id);
+    var expander = el.find('.expander');
+    var folder = el.find('.icon-folder');
 
     if (el.hasClass('open')) {
         collapseScmEntry(id);
         el.find('.expander').switchClass('icon-expanded', 'icon-collapsed');
         el.addClass('collapsed');
-        updateSVGIcon(el.find('.icon-folder')[0], 'folder')
+        updateSVGIcon(folder[0], 'folder')
+        toggleExpendCollapseIcon(expander[0]);
 
         return false;
     } else if (el.hasClass('loaded')) {
         expandScmEntry(id);
         el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
         el.removeClass('collapsed');
-        updateSVGIcon(el.find('.icon-folder-open')[0], 'folder-open')
+        updateSVGIcon(folder[0], 'folder-open')
+        toggleExpendCollapseIcon(expander[0]);
 
         return false;
     }
@@ -611,8 +615,9 @@ function scmEntryClick(id, url) {
       success: function(data) {
         el.after(data);
         el.addClass('open').addClass('loaded').removeClass('loading');
-        updateSVGIcon(el.find('.icon-folder')[0], 'folder-open')
         el.find('.expander').switchClass('icon-collapsed', 'icon-expanded');
+        updateSVGIcon(folder[0], 'folder-open')
+        toggleExpendCollapseIcon(expander[0]);
       }
     });
     return true;