Fix redirection

packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js

@@ -148,13 +148,19 @@ function EditView({
       }
     };
 
-    fetchGroupLayouts();
-
     if (!isCreatingEntry) {
       fetchData();
+    } else {
+      dispatch({
+        type: 'INIT',
+        data: setDefaultForm(get(layout, ['schema', 'attributes'])),
+      });
     }
+
+    fetchGroupLayouts();
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id, isCreatingEntry, slug, source]);
+  }, [id, isCreatingEntry, slug, source, pathname]);
 
   if (shouldShowLoader) {
     return <LoadingIndicatorPage />;

packages/strapi-plugin-content-manager/admin/src/containers/EditView/init.js

@@ -1,4 +1,3 @@
-import { fromJS } from 'immutable';
 import { get } from 'lodash';
 
 const setDefaultForm = attributes => {
@@ -34,17 +33,7 @@ const setDefaultForm = attributes => {
   }, {});
 };
 
-function init(initialState, layout, isCreatingEntry) {
+function init(initialState) {
-  if (isCreatingEntry) {
-    const defaultForm = setDefaultForm(
-      get(layout, ['schema', 'attributes'], {})
-    );
-
-    return initialState
-      .update('initialData', () => fromJS(defaultForm))
-      .update('modifiedData', () => fromJS(defaultForm));
-  }
-
   return initialState;
 }
 

packages/strapi-plugin-content-manager/admin/src/containers/EditView/reducer.js

@@ -85,6 +85,10 @@ function reducer(state, action) {
           return obj;
         })
         .update('isLoadingForLayouts', () => false);
+    case 'INIT':
+      return initialState
+        .set('initialData', fromJS(action.data))
+        .set('modifiedData', fromJS(action.data));
     case 'MOVE_FIELD':
       return state.updateIn(['modifiedData', ...action.keys], list => {
         return list