diff --git a/opencti-platform/opencti-front/src/private/components/common/files/workbench/WorkbenchFileContent.jsx b/opencti-platform/opencti-front/src/private/components/common/files/workbench/WorkbenchFileContent.jsx
index 03e5351794bee..a8190bb4f1bf0 100644
--- a/opencti-platform/opencti-front/src/private/components/common/files/workbench/WorkbenchFileContent.jsx
+++ b/opencti-platform/opencti-front/src/private/components/common/files/workbench/WorkbenchFileContent.jsx
@@ -105,16 +105,6 @@ const useStyles = makeStyles((theme) => ({
     float: 'left',
     marginTop: '-13px',
   },
-  drawerPaper: {
-    minHeight: '100vh',
-    width: '50%',
-    position: 'fixed',
-    transition: theme.transitions.create('width', {
-      easing: theme.transitions.easing.sharp,
-      duration: theme.transitions.duration.enteringScreen,
-    }),
-    padding: 0,
-  },
   createButton: {
     position: 'fixed',
     bottom: 30,
@@ -124,16 +114,6 @@ const useStyles = makeStyles((theme) => ({
       duration: theme.transitions.duration.enteringScreen,
     }),
   },
-  header: {
-    backgroundColor: theme.palette.background.nav,
-    padding: '20px 20px 20px 60px',
-  },
-  closeButton: {
-    position: 'absolute',
-    top: 12,
-    left: 5,
-    color: 'inherit',
-  },
   linesContainer: {
     marginTop: 0,
   },
@@ -722,7 +702,7 @@ const WorkbenchFileContentComponent = ({
       'object_refs',
       (n.object_refs || []).filter(
         (o) => !objectsToBeDeletedIds.includes(o)
-          && !stixCoreRelationshipsToRemove.includes(o),
+            && !stixCoreRelationshipsToRemove.includes(o),
       ),
       n,
     ));
@@ -1031,7 +1011,7 @@ const WorkbenchFileContentComponent = ({
       'object_refs',
       (n.object_refs || []).filter(
         (o) => o !== toDeleteObject.id
-          && !stixCoreRelationshipsToRemove.includes(o),
+            && !stixCoreRelationshipsToRemove.includes(o),
       ),
       n,
     ));
@@ -1129,7 +1109,7 @@ const WorkbenchFileContentComponent = ({
           newEntity.identity_class = resolveIdentityClass(currentEntityType);
         } else if (
           newEntity.type === 'location'
-          && !newEntity.x_opencti_location_type
+            && !newEntity.x_opencti_location_type
         ) {
           newEntity.x_opencti_location_type = currentEntityType;
         }
@@ -1482,7 +1462,7 @@ const WorkbenchFileContentComponent = ({
     );
     setContainerSelectAll(
       (container.object_refs || []).length
-      >= Object.keys(indexedStixObjects).length,
+        >= Object.keys(indexedStixObjects).length,
     );
     setContainerStep(1);
     setStixDomainObjects(
@@ -3196,7 +3176,7 @@ const WorkbenchFileContentComponent = ({
                             render={({ props }) => {
                               if (props && props.stixDomainObjects) {
                                 return props.stixDomainObjects.edges.length
-                                > 0 ? (
+                                  > 0 ? (
                                   <ItemBoolean
                                     variant="inList"
                                     status={true}
@@ -3438,7 +3418,7 @@ const WorkbenchFileContentComponent = ({
                             render={({ props }) => {
                               if (props && props.stixCyberObservables) {
                                 return props.stixCyberObservables.edges.length
-                                > 0 ? (
+                                  > 0 ? (
                                   <ItemBoolean
                                     variant="inList"
                                     status={true}
@@ -3494,28 +3474,13 @@ const WorkbenchFileContentComponent = ({
         </Fab>
         <Drawer
           open={displayObservable}
-          anchor="right"
-          sx={{ zIndex: 1202 }}
-          elevation={1}
-          classes={{ paper: classes.drawerPaper }}
           onClose={handleCloseObservable}
+          title={t('Manage an observable')}
         >
-          <div className={classes.header}>
-            <IconButton
-              aria-label="Close"
-              className={classes.closeButton}
-              onClick={handleCloseObservable}
-              size="large"
-              color="primary"
-            >
-              <Close fontSize="small" color="primary" />
-            </IconButton>
-            <Typography variant="h6">{t('Manage an observable')}</Typography>
-          </div>
-          <div className={classes.container}>
+          <>
             {!observableType && renderObservableTypesList()}
             {observableType && renderObservableForm()}
-          </div>
+          </>
         </Drawer>
       </div>
     );
@@ -3655,28 +3620,11 @@ const WorkbenchFileContentComponent = ({
           ))}
         </List>
         <Drawer
-          open={relationshipId}
-          anchor="right"
-          sx={{ zIndex: 1202 }}
-          elevation={1}
-          classes={{ paper: classes.drawerPaper }}
+          open={entityStep != null}
           onClose={handleCloseRelationship}
+          title={t('Manage a relationship')}
         >
-          <div className={classes.header}>
-            <IconButton
-              aria-label="Close"
-              className={classes.closeButton}
-              onClick={handleCloseRelationship}
-              size="large"
-              color="primary"
-            >
-              <Close fontSize="small" color="primary" />
-            </IconButton>
-            <Typography variant="h6">{t('Manage a relationship')}</Typography>
-          </div>
-          <div className={classes.container}>
-            {relationshipId && renderRelationshipForm()}
-          </div>
+          <>{relationshipId && renderRelationshipForm()}</>
         </Drawer>
       </>
     );
@@ -4013,7 +3961,7 @@ const WorkbenchFileContentComponent = ({
                             render={({ props }) => {
                               if (props && props.stixDomainObjects) {
                                 return props.stixDomainObjects.edges.length
-                                > 0 ? (
+                                  > 0 ? (
                                   <ItemBoolean
                                     variant="inList"
                                     status={true}
@@ -4069,29 +4017,14 @@ const WorkbenchFileContentComponent = ({
         </Fab>
         <Drawer
           open={containerStep != null}
-          anchor="right"
-          sx={{ zIndex: 1202 }}
-          elevation={1}
-          classes={{ paper: classes.drawerPaper }}
           onClose={handleCloseContainer}
+          title={t('Manage a container')}
         >
-          <div className={classes.header}>
-            <IconButton
-              aria-label="Close"
-              className={classes.closeButton}
-              onClick={handleCloseContainer}
-              size="large"
-              color="primary"
-            >
-              <Close fontSize="small" color="primary" />
-            </IconButton>
-            <Typography variant="h6">{t('Manage a container')}</Typography>
-          </div>
-          <div className={classes.container}>
+          <>
             {!containerType && renderContainerTypesList()}
             {containerType && containerStep === 0 && renderContainerForm()}
             {containerType && containerStep === 1 && renderContainerContext()}
-          </div>
+          </>
         </Drawer>
       </div>
     );
diff --git a/opencti-platform/opencti-front/src/schema/relay.schema.graphql b/opencti-platform/opencti-front/src/schema/relay.schema.graphql
index bfe8471e3b64f..2dd2daa5bfe50 100644
--- a/opencti-platform/opencti-front/src/schema/relay.schema.graphql
+++ b/opencti-platform/opencti-front/src/schema/relay.schema.graphql
@@ -7826,6 +7826,7 @@ enum StixCoreRelationshipsFilter {
   toTypes
   entity_type
   fromId
+  toId
   elementId
 }
 
diff --git a/opencti-platform/opencti-graphql/src/generated/graphql.ts b/opencti-platform/opencti-graphql/src/generated/graphql.ts
index 0282e2ffe710d..f1d2dae79ae52 100644
--- a/opencti-platform/opencti-graphql/src/generated/graphql.ts
+++ b/opencti-platform/opencti-graphql/src/generated/graphql.ts
@@ -22837,6 +22837,7 @@ export enum StixCoreRelationshipsFilter {
   RelationshipType = 'relationship_type',
   Revoked = 'revoked',
   ToCreatedAt = 'toCreatedAt',
+  ToId = 'toId',
   ToMainObservableType = 'toMainObservableType',
   ToName = 'toName',
   ToPatternType = 'toPatternType',