diff --git a/ChangeLog b/ChangeLog
index 751e7d2..ba821a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-01  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (FILE_CARD_TERMINATED_OPENPGP): Remove.
+	(cmd_select_file): Don't change file_selection.
+
 2017-07-19  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* src/mod.c (mod_inv): Clear TMP.
diff --git a/src/openpgp.c b/src/openpgp.c
index 5b788b0..4e19802 100644
--- a/src/openpgp.c
+++ b/src/openpgp.c
@@ -98,7 +98,6 @@ set_res_sw (uint8_t sw1, uint8_t sw2)
 #define FILE_EF_UPDATE_KEY_2	7
 #define FILE_EF_UPDATE_KEY_3	8
 #define FILE_EF_CH_CERTIFICATE	9
-#define FILE_CARD_TERMINATED_OPENPGP	254
 #define FILE_CARD_TERMINATED	255
 
 uint8_t file_selection;
@@ -760,8 +759,7 @@ cmd_select_file (void)
 
       if (file_selection == FILE_CARD_TERMINATED)
 	{
-	  file_selection = FILE_CARD_TERMINATED_OPENPGP;
-	  GPG_APPLICATION_TERMINATED();
+	  GPG_APPLICATION_TERMINATED ();
 	  return;
 	}
 
@@ -1323,9 +1321,9 @@ cmd_get_challenge (void)
 static void
 cmd_activate_file (void)
 {
-  if (file_selection != FILE_CARD_TERMINATED_OPENPGP)
+  if (file_selection != FILE_CARD_TERMINATED)
     {
-      GPG_NO_RECORD();
+      GPG_NO_RECORD ();
       return;
     }
 
@@ -1342,7 +1340,7 @@ cmd_terminate_df (void)
 
   if (file_selection != FILE_DF_OPENPGP)
     {
-      GPG_NO_RECORD();
+      GPG_NO_RECORD ();
       return;
     }
 
@@ -1426,13 +1424,13 @@ process_command_apdu (void)
       if (file_selection == FILE_CARD_TERMINATED
 	  && cmd != INS_SELECT_FILE && cmd != INS_ACTIVATE_FILE
 	  && cmd != INS_GET_CHALLENGE && cmd != INS_EXTERNAL_AUTHENTICATE)
-	GPG_APPLICATION_TERMINATED();
+	GPG_APPLICATION_TERMINATED ();
       else if (file_selection != FILE_DF_OPENPGP
 	       && cmd != INS_SELECT_FILE && cmd != INS_ACTIVATE_FILE
 	       && cmd != INS_GET_CHALLENGE && cmd != INS_EXTERNAL_AUTHENTICATE
 	       && cmd != INS_WRITE_BINARY && cmd != INS_UPDATE_BINARY
 	       && cmd != INS_READ_BINARY)
-	GPG_NO_RECORD();
+	GPG_NO_RECORD ();
       else
 	{
 	  chopstx_setcancelstate (1);