diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c
index 7f53fea57..5183ee739 100644
--- a/client/src/cmdhf.c
+++ b/client/src/cmdhf.c
@@ -127,6 +127,15 @@ int CmdHFSearch(const char *Cmd) {
         }
     }
 
+    PROMPT_CLEARLINE;
+    PrintAndLogEx(INPLACE, " Searching for FeliCa tag...");
+    if (IfPm3Felica()) {
+        if (read_felica_uid(false, false) == PM3_SUCCESS) {
+            PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO18092 / FeliCa tag") " found\n");
+            res = PM3_SUCCESS;
+        }
+    }
+
     // 14b  is the longest test (put last)
     PROMPT_CLEARLINE;
     PrintAndLogEx(INPLACE, " Searching for ISO14443-B tag...");
@@ -139,22 +148,13 @@ int CmdHFSearch(const char *Cmd) {
 
     /*
     PROMPT_CLEARLINE;
-    PrintAndLogEx(INPLACE, " Searching for FeliCa tag...");
-    if (IfPm3Felica()) {
-        if (read_felica_uid(false, false) == PM3_SUCCESS) {
-            PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO18092 / FeliCa tag") " found\n");
+    PrintAndLogEx(INPLACE, " Searching for CryptoRF tag...");
+    if (IfPm3Iso14443b()) {
+        if (readHFCryptoRF(false, false) == PM3_SUCCESS) {
+            PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("CryptoRF tag") " found\n");
             res = PM3_SUCCESS;
         }
     }
-
-        PROMPT_CLEARLINE;
-        PrintAndLogEx(INPLACE, " Searching for CryptoRF tag...");
-        if (IfPm3Iso14443b()) {
-            if (readHFCryptoRF(false, false) == PM3_SUCCESS) {
-                PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("CryptoRF tag") " found\n");
-                res = PM3_SUCCESS;
-            }
-        }
     */
 
     PROMPT_CLEARLINE;