diff --git a/platform/commonUI/browse/src/ViewSwitcherController.js b/platform/commonUI/browse/src/ViewSwitcherController.js
index 058aaaa360..287afdfe90 100644
--- a/platform/commonUI/browse/src/ViewSwitcherController.js
+++ b/platform/commonUI/browse/src/ViewSwitcherController.js
@@ -31,8 +31,8 @@ define(
             }
 
             // Get list of views, read from capability
-            $scope.$watch("view", function () {
-                var options = $scope.view || [ {} ];
+            function updateOptions(views) {
+                var options = views || [];
 
                 $scope.switcher = {
                     options: options,
@@ -41,7 +41,11 @@ define(
                         ($scope.switcher || {}).selected
                     )
                 };
-            });
+            }
+
+            // Update view options when the in-scope results of using the
+            // view capability change.
+            $scope.$watch("view", updateOptions);
         }
 
         return ViewSwitcherController;
diff --git a/platform/commonUI/browse/test/ViewSwitcherControllerSpec.js b/platform/commonUI/browse/test/ViewSwitcherControllerSpec.js
index 831d7383e3..9bc42ab2b3 100644
--- a/platform/commonUI/browse/test/ViewSwitcherControllerSpec.js
+++ b/platform/commonUI/browse/test/ViewSwitcherControllerSpec.js
@@ -5,11 +5,81 @@
  */
 define(
     ["../src/ViewSwitcherController"],
-    function (BrowseController) {
+    function (ViewSwitcherController) {
         "use strict";
 
         describe("The view switcher controller", function () {
+            var mockScope,
+                controller;
 
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", [ "$watch" ]);
+                controller = new ViewSwitcherController(mockScope);
+            });
+
+            it("watches for changes in applicable views", function () {
+                // The view capability is used by associated
+                // representations, so "view" in scope should always
+                // be the list of applicable views. The view switcher
+                // controller should be watching this.
+                expect(mockScope.$watch).toHaveBeenCalledWith(
+                    "view",
+                    jasmine.any(Function)
+                );
+            });
+
+            it("updates available options to reflect views", function () {
+                var views = [
+                    { key: "a", name: "View A" },
+                    { key: "b", name: "View B" },
+                    { key: "c", name: "View C" },
+                    { key: "d", name: "View D" }
+                ];
+                mockScope.$watch.mostRecentCall.args[1](views);
+                expect(mockScope.switcher.options).toEqual(views);
+            });
+
+            it("maintains the current selection when views change", function () {
+                var views = [
+                    { key: "a", name: "View A" },
+                    { key: "b", name: "View B" },
+                    { key: "c", name: "View C" },
+                    { key: "d", name: "View D" }
+                ];
+                mockScope.$watch.mostRecentCall.args[1](views);
+                mockScope.switcher.selected = views[1];
+
+                // Change the set of applicable views
+                mockScope.$watch.mostRecentCall.args[1]([
+                    { key: "a", name: "View A" },
+                    { key: "b", name: "View B" },
+                    { key: "x", name: "View X" }
+                ]);
+
+                // "b" is still in there, should remain selected
+                expect(mockScope.switcher.selected).toEqual(views[1]);
+            });
+
+            it("chooses a default if a selected view becomes inapplicable", function () {
+                var views = [
+                    { key: "a", name: "View A" },
+                    { key: "b", name: "View B" },
+                    { key: "c", name: "View C" },
+                    { key: "d", name: "View D" }
+                ];
+                mockScope.$watch.mostRecentCall.args[1](views);
+                mockScope.switcher.selected = views[1];
+
+                // Change the set of applicable views
+                mockScope.$watch.mostRecentCall.args[1]([
+                    { key: "a", name: "View A" },
+                    { key: "c", name: "View C" },
+                    { key: "x", name: "View X" }
+                ]);
+
+                // "b" is still in there, should remain selected
+                expect(mockScope.switcher.selected).not.toEqual(views[1]);
+            });
 
         });
     }