diff --git a/UI/WebServerResources/js/Common/ui-desktop.js b/UI/WebServerResources/js/Common/ui-desktop.js
index ae34562fe..a7f72d264 100644
--- a/UI/WebServerResources/js/Common/ui-desktop.js
+++ b/UI/WebServerResources/js/Common/ui-desktop.js
@@ -216,7 +216,7 @@
           '<md-item>' +
           '  <md-item-content>' +
           '    <i class="md-icon-folder-open"></i>' +
-          '    <a class="md-flex md-tile-content sg-item-name">{{folder.name}}</a>' +
+          '    <button class="md-button md-flex md-tile-content sg-item-name">{{folder.name}}</button>' +
           '    <md-input-container class="md-flex md-tile-content ng-hide">'+
           '      <input type="text"' +
           '             ng-model="folder.name"' +
@@ -241,10 +241,10 @@
 
             // Set CSS class for folder hierarchical level
             level = scope.folder.path.split('/').length - 1;
-            angular.element(iElement.find('i')[0]).addClass('childLevel' + level);
+            angular.element(iElement.find('i')[0]).addClass('sg-child-level-' + level);
 
             // Select dynamic elements
-            link = angular.element(iElement.find('a')[0]);
+            link = angular.element(iElement.find('button')[0]);
             inputContainer = angular.element(iElement.find('md-input-container'));
             input = iElement.find('input')[0];
 
diff --git a/UI/WebServerResources/scss/views/MailerUI.scss b/UI/WebServerResources/scss/views/MailerUI.scss
index cc806b892..880db115c 100644
--- a/UI/WebServerResources/scss/views/MailerUI.scss
+++ b/UI/WebServerResources/scss/views/MailerUI.scss
@@ -25,7 +25,7 @@ md-sidenav {
 
 $i: 1;
 @while $i < 12 {
-    md-item-content .childLevel#{$i} { padding-left: 15px * $i; }
+    md-item-content .sg-child-level-#{$i} { padding-left: 15px * $i; }
     $i: $i + 1;
 }