diff --git a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
index 303bb482d..660fa3ee2 100644
--- a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
@@ -59,7 +59,6 @@
 
     this.$onInit = function() {
       this.$element = $element;
-      this.service = Mailbox;
       this.editMode = false;
       this.accountController.addMailboxController(this);
     };
@@ -84,7 +83,7 @@
 
 
     this.selectFolder = function($event) {
-      if (this.editMode || this.mailbox == Mailbox.selectedFolder)
+      if (this.editMode || this.mailbox == Mailbox.selectedFolder || this.mailbox.isNoSelect())
         return;
       Mailbox.$virtualPath = false;
       Mailbox.$virtualMode = false;