diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
index 3c78739..08f02fd 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
@@ -123,6 +123,7 @@
         SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putInt("aid", aid);
+        this.aid = aid;
         editor.commit();
     }
 
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
index 2efeef7..a5c45c9 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
@@ -18,6 +18,7 @@
 import org.ntlab.acanthus_client.Acanthus;
 import org.ntlab.acanthus_client.R;
 import org.ntlab.acanthus_client.databinding.FragmentEditBinding;
+import org.ntlab.acanthus_client.entities.AidJson;
 import org.ntlab.acanthus_client.entities.Animation;
 import org.ntlab.acanthus_client.entities.AnimationJson;
 import org.ntlab.acanthus_client.entities.WorkJson;
@@ -141,6 +142,15 @@
 
 
         });
+
+        editViewModel.getAidJson().observe(getViewLifecycleOwner(), new Observer<AidJson>() {
+            @Override
+            public void onChanged(AidJson aidJson) {
+                acanthus.setAid(aidJson.getAid());
+              //  acanthus.getAid();
+                transitionPaintActivity();
+            }
+        });
     }
     //-------------------------------------------------------------------------------------------------
 
@@ -167,8 +177,6 @@
             //String token = acanthus.getPreferenceToken();
             //Integer aid = editViewModel.startWorkEdit(uid, name, token);
             editViewModel.startWorkEdit(uid, name, token);
-            //editViewModel.getAidJson().observe();
-            transitionPaintActivity();
         });
 
         editButton.setOnClickListener(v -> {
@@ -192,7 +200,6 @@
     private void transitionPaintActivity(AnimationJson animationJson) {
         Acanthus acanthus = (Acanthus) getActivity().getApplication();
         Intent intent = new Intent(acanthus, PaintActivity.class);
-        intent.putExtra("AnimationJsonData", animationJson);
         acanthus.setAid(animationJson.getAid());
         startActivity(intent);
     }
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
index 00c0f7f..4c17d1d 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
@@ -35,12 +35,15 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         init();
+        initView();
+
     }
 
     //-----------------------------------------------------------------
     @Override
-    protected void onStart() {
-        super.onStart();
+    protected void onResume() {
+        super.onResume();
+
         displayAid();
     }
 
@@ -71,8 +74,6 @@
         paintViewModel = new ViewModelProvider(this).get(PaintViewModel.class);
         paintViewModel.init(acanthus);
 
-        initView();
-
         startObserve();
     }
 
@@ -103,7 +104,8 @@
     // デバッグ用の現在編集中のAid表示
     private void displayAid() {
         Acanthus acanthus = (Acanthus) getApplication();
-        binding.textViewCurAid.setText("aid:" + acanthus.getAid().toString());
+        TextView view = findViewById(R.id.textViewCurAid);
+        view.setText("aid:" + acanthus.getAid().toString());
     }
 
     //------------------------------------------------------------------