diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups.elm
index 3a7bc25875e..36fd467547a 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups.elm
@@ -54,13 +54,13 @@ update msg model =
         ui = model.ui
         -- we need to reload to make sure we are not in a details page, or else some external elements will replace our Elm dom elements
       in
-       ({ model | mode = Loading, groupsCompliance = Dict.empty, ui = { ui | modal = ExternalModal, loadingGroups = True } }, createGroupModal ())
+       ({ model | mode = Loading, groupsCompliance = Dict.empty, ui = { ui | loadingGroups = True } }, createGroupModal ())
     CloseModal -> 
       let
         ui = model.ui
       in
-        ({ model | ui = { ui | modal = NoModal, loadingGroups = True } }, Cmd.batch [ getGroupsTree model False ])
-    LoadGroupTable -> 
+        ({ model | ui = { ui | loadingGroups = True } }, Cmd.batch [ getGroupsTree model False ])
+    LoadGroupTable ->
       let
         ui = model.ui
         newModel = 
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/DataTypes.elm
index 89db557a163..7f9a2b647de 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/DataTypes.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/DataTypes.elm
@@ -69,12 +69,10 @@ getSubElems cat =
 
 type alias UI =
   { groupFilters   : Filters
-  , modal          : ModalState
   , hasWriteRights : Bool
   , loadingGroups  : Bool
   }
 
-type ModalState = NoModal | ExternalModal
 
 type alias Filters =
   { tableFilters : TableFilters SortBy
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/Init.elm
index f0a5402387e..ce8ac13982c 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/Init.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/Init.elm
@@ -15,7 +15,7 @@ init flags =
     initTableFilters  = defaultTableFilters Name
     initTreeFilters   = (TreeFilters "" [])
     initFilters       = Filters initTableFilters initTreeFilters
-    initUI       = UI initFilters NoModal flags.hasWriteRights True
+    initUI       = UI initFilters flags.hasWriteRights True
     initModel    = Model flags.contextPath Loading initUI initCategory Dict.empty
     listInitActions =
       [ getGroupsTree initModel (not flags.hasGroupToDisplay)
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
index 55d0609aab0..3487e57c35e 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
@@ -118,10 +118,6 @@ view model =
           ]
         ]
       ExternalTemplate -> text ""
-
-    modal = case model.ui.modal of
-      NoModal -> text ""
-      ExternalModal -> div [class "modal-backdrop fade show", style "height" "100%"] []
   in
     div [class "rudder-template"]
     [ div [class "template-sidebar sidebar-left"]
@@ -172,5 +168,4 @@ view model =
       [ 
         templateMain
       ]
-    , modal
     ]
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
index 971360aef8a..bd32f8faf65 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
@@ -217,7 +217,9 @@ class Groups extends StatefulSnippet with DefaultExtendableSnippet[Groups] with
                  |// When custom event to close group details fires, we load the group table state in the Elm app
                  |$$("#${htmlId_item}").on("group-close-detail", function () {
                  |  $$("#${htmlId_item} .main-container").hide(); // guarantee to hide details
-                 |  app.ports.loadGroupTable.send(null)
+                 |  app.ports.loadGroupTable.send(null);
+                 |  const url = contextPath + "/secure/nodeManager/groups"
+                 |    history.pushState({}, '', url);
                  |});
                  |
                  |// Initialize tooltips