diff --git a/app/controller/sdl/Abstract/Controller.js b/app/controller/sdl/Abstract/Controller.js
index 9b52a4e6e..8728f7cbd 100644
--- a/app/controller/sdl/Abstract/Controller.js
+++ b/app/controller/sdl/Abstract/Controller.js
@@ -242,11 +242,11 @@ SDL.SDLController = Em.Object.extend(
      * StateManager
      */
     deactivateApp: function() {
-      SDL.SDLController.onSubMenu('top');
       if (this.model) {
+        SDL.SDLController.onSubMenu('top');
         SDL.SDLModel.onDeactivateApp(SDL.States.nextState, this.model.appID);
+        SDL.SDLController.model.set('tbtActivate', false);
       }
-      SDL.SDLController.model.set('tbtActivate', false);
       this.set('model', null);
     },
     /**
diff --git a/app/model/sdl/Abstract/Model.js b/app/model/sdl/Abstract/Model.js
index 561e511ed..c52fdde4b 100644
--- a/app/model/sdl/Abstract/Model.js
+++ b/app/model/sdl/Abstract/Model.js
@@ -1748,8 +1748,7 @@ SDL.SDLModel = Em.Object.extend({
       SDL.TurnByTurnView.deactivate();
 
       if (!SDL.SDLModel.data.phoneCallActive &&
-          !SDL.SDLModel.data.templateChangeInProgress &&
-          reason == 'GENERAL') {
+          !SDL.SDLModel.data.templateChangeInProgress) {
         FFW.BasicCommunication.OnAppDeactivated(appID);
       }
     }