diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
index d3114c89..eec5c098 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
@@ -198,6 +198,7 @@ public class TunnelEditorFragment extends BaseFragment {
         if (throwable == null) {
             message = getString(R.string.tunnel_create_success, tunnel.getName());
             Log.d(TAG, message);
+            localTunnel = tunnel;
             onFinished();
         } else {
             final String error = ExceptionLoggers.unwrap(throwable).getMessage();