diff --git a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt
index dafd4d10a..adf30b825 100644
--- a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt
+++ b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt
@@ -390,6 +390,9 @@ class MeFragment : BaseFragment(), View.OnClickListener {
                     mBinding.ivHeadWear.tag = effect
                 }
 
+            } ?: run {
+                mBinding.ivHeadWear.setImageResource(0)
+                mBinding.ivHeadWear.tag = null
             }
         }
 
diff --git a/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java b/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java
index cc35dd31a..e81333699 100644
--- a/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java
+++ b/app/src/main/java/com/mango/moshen/ui/im/InputPanel.java
@@ -256,9 +256,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba
     }
 
     public boolean collapse(boolean immediately) {
-        boolean respond = mHelper.isPanelState() || mHelper.isKeyboardState() || isKeyboardShowed;
-        mHelper.resetState();
-        return respond;
+        return mHelper.hookSystemBackByPanelSwitcher();
     }
 
     public void addAitTextWatcher(TextWatcher watcher) {