From 10dd1579ac90cac95e336bca43b184e29401fd66 Mon Sep 17 00:00:00 2001
From: HichamELBSI <elabbassih@gmail.com>
Date: Wed, 16 Jun 2021 16:41:55 +0200
Subject: [PATCH] Fix go back

Signed-off-by: HichamELBSI <elabbassih@gmail.com>
---
 .../src/components/SettingsViewWrapper/index.js     | 13 ++++++++-----
 .../admin/src/pages/App/tests/index.test.js         |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/core/content-manager/admin/src/components/SettingsViewWrapper/index.js b/packages/core/content-manager/admin/src/components/SettingsViewWrapper/index.js
index e77fd88f40..ca199a7495 100644
--- a/packages/core/content-manager/admin/src/components/SettingsViewWrapper/index.js
+++ b/packages/core/content-manager/admin/src/components/SettingsViewWrapper/index.js
@@ -149,13 +149,16 @@ const SettingsViewWrapper = ({
         uid,
       } = modifiedData;
       const _sort = `${defaultSortBy}:${defaultSortOrder}`;
-
-      history.replace(
-        `/plugins/${pluginId}/${kind}/${uid}?${stringify({
+      const goBackSearch = `${stringify(
+        {
           page: 1,
           pageSize,
-        })}&_sort=${_sort}${pluginsQueryParams ? `&${pluginsQueryParams}` : ''}`
-      );
+          _sort,
+        },
+        { encode: false }
+      )}${pluginsQueryParams ? `&${pluginsQueryParams}` : ''}`;
+
+      history.replace(`/plugins/${pluginId}/${kind}/${uid}?${goBackSearch}`);
     }
   };
 
diff --git a/packages/core/content-manager/admin/src/pages/App/tests/index.test.js b/packages/core/content-manager/admin/src/pages/App/tests/index.test.js
index bb464907c4..de788c516b 100644
--- a/packages/core/content-manager/admin/src/pages/App/tests/index.test.js
+++ b/packages/core/content-manager/admin/src/pages/App/tests/index.test.js
@@ -391,8 +391,8 @@ describe('Content manager | App | main', () => {
             </div>
           </div>
           <div
-            class="col-md-9 content"
-            style="padding: 0px 30px;"
+            class="col-md-9"
+            style="padding: 0px;"
           >
             <div
               class="c3"