diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
index de0cfcc264..fbaae3255b 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
@@ -45,6 +45,20 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
         }
         super.onCreate( savedInstanceState );
         AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true );
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        try {
+            AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
+        } catch ( Exception e ) {
+        }
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
         try {
             AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
         } catch ( Exception e ) {
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 5a8ab8bafc..cff61f0be8 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -271,6 +271,8 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onAppExit() {
-        mWindowView.setVisibility(View.GONE);
+        if ( mWindowView != null ) {
+            mWindowView.setVisibility(View.GONE);
+        }
     }
 }