diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index dd34436aaa..6c04778b47 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -229,9 +229,10 @@ define([
                 var path = dir.path;
                 var context = 'my';
 
-                if (dir.category.startsWith('org')) {
+                var category_start = dir.category.split('/')[0];
+                if (category_start == 'org') {
                     context = 'org';
-                } else if (dir.category.startsWith('group')) {
+                } else if (category_start == 'group') {
                     context = 'group';
                 }
                 var obj = {
diff --git a/static/scripts/app/views/group-side-nav.js b/static/scripts/app/views/group-side-nav.js
index e43765c664..83adedb846 100644
--- a/static/scripts/app/views/group-side-nav.js
+++ b/static/scripts/app/views/group-side-nav.js
@@ -16,6 +16,9 @@ define([
         },
 
         render: function (group_id) {
+            if (this.group_id && this.group_id == group_id) {
+                return;
+            }
             this.group_id = group_id;
             var _this = this;
             $.ajax({