diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
index 0a85cd595d..4e7382f89f 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
@@ -77,7 +77,7 @@ public class NaviClient implements IMogoNavi {
     private boolean mAimlessStatus;
 
     private NaviClient( Context context ) {
-        mContext = context;
+        mContext = context.getApplicationContext();
         if ( DebugConfig.isUseCustomNavi() ) {
             // 按需初始化导航组件
             initAMapNavi();
diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
index 27bb5bf10f..372dabf07c 100644
--- a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
+++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
@@ -3,17 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_widgets_app_entrance_root"
-    android:background="@drawable/module_widgets_app_entrance_root_bkg"
     android:layout_width="wrap_content"
-    android:padding="@dimen/module_widgets_app_entrance_root_padding"
+    android:layout_height="wrap_content"
+    android:background="@drawable/module_widgets_app_entrance_root_bkg"
     android:gravity="center_vertical"
-    android:layout_height="wrap_content">
+    android:padding="@dimen/module_widgets_app_entrance_root_padding">
 
     <LinearLayout
         android:id="@+id/module_widgets_app_handler_container"
         android:layout_width="@dimen/module_widgets_app_handler_width"
-        android:background="@drawable/module_widgets_app_handler_bkg"
         android:layout_height="match_parent"
+        android:background="@drawable/module_widgets_app_handler_bkg"
         android:gravity="center">
 
         <ImageView
@@ -26,11 +26,13 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+
         <TextView
             android:id="@+id/module_widgets_app_entrance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:maxLines="1"
             android:paddingLeft="@dimen/module_widgets_app_entrance_paddingLeft"
             android:paddingTop="@dimen/module_widgets_app_entrance_paddingTop"
             android:paddingRight="@dimen/module_widgets_app_entrance_paddingLeft"
@@ -51,6 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:maxLines="1"
             android:paddingLeft="@dimen/module_widgets_app_entrance_paddingLeft"
             android:paddingTop="@dimen/module_widgets_app_entrance_paddingTop"
             android:paddingRight="@dimen/module_widgets_app_entrance_paddingLeft"