diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
index 5b8e8d603..1441c6c88 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
@@ -17,6 +17,7 @@ package fr.gouv.etalab.mastodon.fragments;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -27,6 +28,8 @@ import android.text.InputFilter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
@@ -36,10 +39,13 @@ import java.util.List;
 
 import fr.gouv.etalab.mastodon.activities.MainActivity;
 import fr.gouv.etalab.mastodon.drawers.SearchTootsListAdapter;
+import fr.gouv.etalab.mastodon.helper.Helper;
 import fr.gouv.etalab.mastodon.sqlite.SearchDAO;
 import fr.gouv.etalab.mastodon.sqlite.Sqlite;
 import fr.gouv.etalab.mastodon.R;
 
+import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
+
 
 /**
  * Created by Thomas on 22/11/2017.
@@ -107,10 +113,28 @@ public class DisplaySearchFragment extends Fragment {
                             searches.add(keyword);
                             if( textviewNoAction.getVisibility() == View.VISIBLE)
                                 textviewNoAction.setVisibility(View.GONE);
+                            SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
+                            int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+                            if( theme == Helper.THEME_LIGHT){
+                                changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black);
+                            }else {
+                                changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
+                            }
                             searchTootsListAdapter.notifyDataSetChanged();
                         }
                     });
                     AlertDialog alertDialog = dialogBuilder.create();
+                    alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                        @Override
+                        public void onDismiss(DialogInterface dialogInterface) {
+                            //Hide keyboard
+                            InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                            assert imm != null;
+                            imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+                        }
+                    });
+                    if( alertDialog.getWindow() != null )
+                        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
                     alertDialog.show();
                 }
             });