diff --git a/TODO b/TODO
index d43815cbbd29e0d07c09e0e54721e1c770d34c2c..19c9959b34822e04af925f62ea60e1e0a1e7148b 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@
   - change tab when viewing RI from LS
   - Refresh detail fragment when changing tab
 - I2PTunnel
-  - Hide edit button
   - Fix bug with HTTP client tunnel wizard
 - Text content
   - Move help content from release notes to help page
@@ -14,6 +13,7 @@
 - Change navbar first-open mechanics to match Android design docs
 - Pull out internal I2P web browser, or disable it
   - What will this require elsewhere?
+- New status image for "no internet"
 
 # Short-term
 
diff --git a/src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java b/src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
index 23238e3262aacf912e896596915e7439e4bd73bd..8350396efca520d4d6cdc0c7de5304efa3a53858 100644
--- a/src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
+++ b/src/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
@@ -108,6 +108,8 @@ public class TunnelDetailFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.fragment_i2ptunnel_detail_actions, menu);
+        // Hide the edit action until we have an edit UI
+        menu.findItem(R.id.action_edit_tunnel).setVisible(false);
     }
 
     @Override