diff --git a/TODO b/TODO
index 62ca488b493ddf7e8b7bc69aa27d169dd0c2ed7d..46a46b35057debd264385c2d6516f4e5805223d2 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@
     <Meeh> If I goto settings->addressbook it crashes
     <str4d> I have an Intent specified in the settings XML
     <str4d> But I can't specify the package there, because the package depends on the flavor
-- Display auto-start setting correctly in I2PTunnel
-    <zzz> shared clients tunnel is starting. Can't remember if i had it enabled before. But I go to i2ptunnel config page, and all the auto start boxes are unchecked
 - Better addressbook column widths
     <zzz> on the i2ptunnel and addressbook pages on the tablet, the columns are too skinny, they aren't as wide as the tab
     <zzz> only a few addressbook entries wrap but on i2ptunnel everything is wrapped and most of the screen is empty
diff --git a/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
index 8350396efca520d4d6cdc0c7de5304efa3a53858..6d51f3054d47ceefbf95565c19f8594e48f91cb0 100644
--- a/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
+++ b/app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java
@@ -18,6 +18,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -100,6 +101,9 @@ public class TunnelDetailFragment extends Fragment {
 
             TextView accessIfacePort = (TextView) v.findViewById(R.id.tunnel_access_interface_port);
             accessIfacePort.setText(mTunnel.getIfacePort());
+
+            CheckBox autoStart = (CheckBox) v.findViewById(R.id.tunnel_autostart);
+            autoStart.setChecked(mTunnel.startAutomatically());
         }
 
         return v;