diff --git a/vipra-ui/app/index.html b/vipra-ui/app/index.html
index 443134fe416756d8d92e8aece2692982f708c07a..05d2dbe8c1f4b31e4fc131d8d182e41c60ad1d2e 100644
--- a/vipra-ui/app/index.html
+++ b/vipra-ui/app/index.html
@@ -54,7 +54,7 @@
         </form>
         <ul class="nav navbar-nav navbar-right">
           <li ng-class="{'text-italic active':rootModels.topicModel}">
-            <a class="active-topicmodel" tabindex="0" ng-click="chooseTopicModel()" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.name : 'Models'}}" analytics-on analytics-event="Menu Item (Topic Models)" analytics-category="Menu actions"></a>
+            <a class="active-topicmodel" tabindex="0" ng-click="chooseTopicModel(true)" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.name : 'Models'}}" analytics-on analytics-event="Menu Item (Topic Models)" analytics-category="Menu actions"></a>
           </li>
           <li class="menu-icon" ng-class="{disabled:!rootModels.helpEnabled}" ng-attr-title="{{ rootModels.helpEnabled ? 'Help' : 'No help available' }}">
             <a ng-click="showHelp()">
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index 9877f182d8ccce527c1d8a0d72372a6a1b350702..8b86823fe34add75ba9a8a784522eadafe1e9a92 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -35,8 +35,8 @@
         }, function() {
           delete localStorage.tm;
           $scope.loadingScreen = false;
-          $scope.chooseTopicModel();
           prevTopicModelDefer.reject();
+          $scope.chooseTopicModel();
         });
       } else {
         prevTopicModelDefer.reject();
@@ -66,8 +66,8 @@
         });
       };
 
-      $scope.chooseTopicModel = function() {
-        $scope.rootModels.tmLoading.finally(function() {
+      $scope.chooseTopicModel = function(manual) {
+        var fn = function() {
           $scope.queryTopicModels();
           $scope.rootModels.topicModelModalOpen = true;
           $('#topicModelModal').modal();
@@ -75,7 +75,11 @@
             $('.selected-model').focus();
           else
             $('.topic-model').first().focus();
-        });
+        };
+        if(manual)
+          $scope.rootModels.tmLoading.finally(fn);
+        else
+          $scope.rootModels.tmLoading.then(null, fn);
       };
 
       $scope.changeTopicModel = function(topicModel) {