diff --git a/NFC/SecretAgentMan/AndroidManifest.xml b/NFC/SecretAgentMan/AndroidManifest.xml
index 85d93177d..3fe07d5a9 100644
--- a/NFC/SecretAgentMan/AndroidManifest.xml
+++ b/NFC/SecretAgentMan/AndroidManifest.xml
@@ -5,6 +5,10 @@
 
 	<uses-permission android:name="android.permission.NFC"/>
 
+	<uses-feature
+		android:name="android.hardware.nfc"
+		android:required="true"/>
+
 	<uses-sdk
 		android:minSdkVersion="14"
 		android:targetSdkVersion="15"/>
diff --git a/NFC/SecretAgentMan/res/menu/activity_main.xml b/NFC/SecretAgentMan/res/menu/activity_main.xml
index c74bf6fcb..9762af06f 100644
--- a/NFC/SecretAgentMan/res/menu/activity_main.xml
+++ b/NFC/SecretAgentMan/res/menu/activity_main.xml
@@ -1,6 +1,6 @@
 
     <menu xmlns:android="http://schemas.android.com/apk/res/android">
         <item android:id="@+id/write_tag" android:title="@string/write_tag" android:showAsAction="ifRoom|withText"></item>
-        <item android:id="@+id/simple_beam" android:title="@string/beam" android:showAsAction="ifRoom|withText"></item>
-        <item android:id="@+id/file_beam" android:title="@string/file_beam" android:showAsAction="ifRoom|withText"></item>
+        <item android:id="@+id/simple_beam" android:title="@string/beam" android:showAsAction="ifRoom|withText" android:enabled="false"></item>
+        <item android:id="@+id/file_beam" android:title="@string/file_beam" android:showAsAction="ifRoom|withText" android:enabled="false"></item>
     </menu>