diff --git a/src/app/config.js b/src/app/config.js
index 60993fb32c2..349b8c281e8 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -155,6 +155,12 @@ angular
                 controller: 'organizationVaultController',
                 data: { pageTitle: 'Organization Vault' }
             })
+            .state('backend.org.groups', {
+                url: '/organization/:orgId/groups',
+                templateUrl: 'app/organization/views/organizationGroups.html',
+                controller: 'organizationGroupsController',
+                data: { pageTitle: 'Organization Groups' }
+            })
 
             // Frontend
             .state('frontend', {
diff --git a/src/app/organization/organizationGroupsController.js b/src/app/organization/organizationGroupsController.js
new file mode 100644
index 00000000000..7dd131566c9
--- /dev/null
+++ b/src/app/organization/organizationGroupsController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.organization')
+
+    .controller('organizationGroupsController', function ($scope, $state) {
+        
+    });
diff --git a/src/app/organization/organizationSubvaultsController.js b/src/app/organization/organizationSubvaultsController.js
index 8fca4ee1f0d..f3af395b5f3 100644
--- a/src/app/organization/organizationSubvaultsController.js
+++ b/src/app/organization/organizationSubvaultsController.js
@@ -45,7 +45,21 @@
                 templateUrl: 'app/organization/views/organizationSubvaultsUsers.html',
                 controller: 'organizationSubvaultsUsersController',
                 size: 'lg',
-                windowClass: 'organizationSubvaultsUsersModal',
+                resolve: {
+                    subvault: function () { return subvault; }
+                }
+            });
+
+            modal.result.then(function () {
+                // nothing to do
+            });
+        };
+
+        $scope.groups = function (subvault) {
+            var modal = $uibModal.open({
+                animation: true,
+                templateUrl: 'app/organization/views/organizationSubvaultsGroups.html',
+                controller: 'organizationSubvaultsGroupsController',
                 resolve: {
                     subvault: function () { return subvault; }
                 }
diff --git a/src/app/organization/organizationSubvaultsGroupsController.js b/src/app/organization/organizationSubvaultsGroupsController.js
new file mode 100644
index 00000000000..e0802b92850
--- /dev/null
+++ b/src/app/organization/organizationSubvaultsGroupsController.js
@@ -0,0 +1,10 @@
+angular
+    .module('bit.organization')
+
+    .controller('organizationSubvaultsGroupsController', function ($scope, $state, $uibModalInstance, subvault) {
+        $scope.subvault = subvault;
+
+        $scope.close = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    });
diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js
index 55f14166ef8..959e2ed1801 100644
--- a/src/app/organization/organizationSubvaultsUsersController.js
+++ b/src/app/organization/organizationSubvaultsUsersController.js
@@ -8,8 +8,6 @@
         $scope.users = [];
 
         $uibModalInstance.opened.then(function () {
-            $scope.modalWindow = angular.element(document).find('.organizationSubvaultsUsersModal');
-
             $scope.loading = false;
             apiService.subvaultUsers.listSubvault(
                 {
diff --git a/src/app/organization/views/organizationGroups.html b/src/app/organization/views/organizationGroups.html
new file mode 100644
index 00000000000..99dd23a3dbb
--- /dev/null
+++ b/src/app/organization/views/organizationGroups.html
@@ -0,0 +1,16 @@
+<section class="content-header">
+    <h1>
+        Groups
+        <small>organize your users</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h3 class="box-title">Coming soon...</h3>
+        </div>
+        <div class="box-body">
+            <p>Groups are coming soon to bitwarden Enterprise organizations.</p>
+        </div>
+    </div>
+</section>
diff --git a/src/app/organization/views/organizationSubvaults.html b/src/app/organization/views/organizationSubvaults.html
index 76ffff058e0..680afd7127d 100644
--- a/src/app/organization/views/organizationSubvaults.html
+++ b/src/app/organization/views/organizationSubvaults.html
@@ -48,6 +48,11 @@
                                                 <i class="fa fa-fw fa-users"></i> Users
                                             </a>
                                         </li>
+                                        <li>
+                                            <a href="javascript:void(0)" ng-click="groups(subvault)">
+                                                <i class="fa fa-fw fa-sitemap"></i> Groups
+                                            </a>
+                                        </li>
                                         <li>
                                             <a href="javascript:void(0)" ng-click="delete(subvault)" class="text-red">
                                                 <i class="fa fa-fw fa-trash"></i> Delete
diff --git a/src/app/organization/views/organizationSubvaultsGroups.html b/src/app/organization/views/organizationSubvaultsGroups.html
new file mode 100644
index 00000000000..6c775e3b467
--- /dev/null
+++ b/src/app/organization/views/organizationSubvaultsGroups.html
@@ -0,0 +1,10 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-sitemap"></i> Groups <small>{{subvault.name}}</small></h4>
+</div>
+<div class="modal-body">
+    Groups are coming soon to bitwarden Enterprise organizations.
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>
diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html
index e485dff62b4..c50cb2452b1 100644
--- a/src/app/views/organizationLayout.html
+++ b/src/app/views/organizationLayout.html
@@ -36,11 +36,6 @@
                     <i class="fa fa-dashboard fa-fw"></i> <span>Dashboard</span>
                 </a>
             </li>
-            <li ng-class="{active: $state.is('backend.org.people')}">
-                <a ui-sref="backend.org.people({orgId: params.orgId})">
-                    <i class="fa fa-users fa-fw"></i> <span>People</span>
-                </a>
-            </li>
             <li ng-class="{active: $state.is('backend.org.vault')}">
                 <a ui-sref="backend.org.vault({orgId: params.orgId})">
                     <i class="fa fa-lock fa-fw"></i> <span>Vault</span>
@@ -51,6 +46,16 @@
                     <i class="fa fa-share-alt fa-fw"></i> <span>Subvaults</span>
                 </a>
             </li>
+            <li ng-class="{active: $state.is('backend.org.people')}">
+                <a ui-sref="backend.org.people({orgId: params.orgId})">
+                    <i class="fa fa-users fa-fw"></i> <span>People</span>
+                </a>
+            </li>
+            <li ng-class="{active: $state.is('backend.org.groups')}">
+                <a ui-sref="backend.org.groups({orgId: params.orgId})">
+                    <i class="fa fa-sitemap fa-fw"></i> <span>Groups</span>
+                </a>
+            </li>
             <li ng-class="{active: $state.is('backend.org.billing')}" ng-if="isOrgOwner(orgProfile)">
                 <a ui-sref="backend.org.billing({orgId: params.orgId})">
                     <i class="fa fa-credit-card fa-fw"></i> <span>Billing</span>
diff --git a/src/index.html b/src/index.html
index 474e6a709bd..6b0110c5799 100644
--- a/src/index.html
+++ b/src/index.html
@@ -146,6 +146,8 @@
     <script src="app/organization/organizationBillingChangePlanController.js"></script>
     <script src="app/organization/organizationVaultController.js"></script>
     <script src="app/organization/organizationVaultLoginSubvaultsController.js"></script>
+    <script src="app/organization/organizationGroupsController.js"></script>
+    <script src="app/organization/organizationSubvaultsGroupsController.js"></script>
 
     <script src="app/settings/settingsModule.js"></script>
     <script src="app/settings/settingsController.js"></script>