diff --git a/src/fireedge/src/client/components/Cards/DiskSnapshotCard.js b/src/fireedge/src/client/components/Cards/DiskSnapshotCard.js
index f01d7d49d2..0e5567da06 100644
--- a/src/fireedge/src/client/components/Cards/DiskSnapshotCard.js
+++ b/src/fireedge/src/client/components/Cards/DiskSnapshotCard.js
@@ -52,7 +52,9 @@ const DiskSnapshotCard = memo(({ snapshot = {}, actions = [] }) => {
     <Paper variant="outlined" className={classes.root}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
           <span className={classes.labels}>
             {isActive && <StatusChip text={<Translate word={T.Active} />} />}
             <StatusChip text={<Translate word={T.Snapshot} />} />
diff --git a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
index 568d8e4f10..a6e85fa5da 100644
--- a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
+++ b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
@@ -61,7 +61,9 @@ const MarketplaceAppCard = memo(
         <div className={classes.main}>
           <div className={classes.title}>
             <StatusCircle color={stateColor} tooltip={stateName} />
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
             {LOCK && <Lock />}
             <span className={classes.labels}>
               <StatusChip text={type} />
diff --git a/src/fireedge/src/client/components/Cards/MarketplaceCard.js b/src/fireedge/src/client/components/Cards/MarketplaceCard.js
index f322b61cdc..a4379acf8c 100644
--- a/src/fireedge/src/client/components/Cards/MarketplaceCard.js
+++ b/src/fireedge/src/client/components/Cards/MarketplaceCard.js
@@ -64,7 +64,9 @@ const MarketplaceCard = memo(
         <div className={classes.main}>
           <div className={classes.title}>
             <StatusCircle color={stateColor} tooltip={stateName} />
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
             {error && (
               <Tooltip
                 arrow
diff --git a/src/fireedge/src/client/components/Cards/NetworkCard.js b/src/fireedge/src/client/components/Cards/NetworkCard.js
index aa109e40de..4f12dbe1a5 100644
--- a/src/fireedge/src/client/components/Cards/NetworkCard.js
+++ b/src/fireedge/src/client/components/Cards/NetworkCard.js
@@ -106,7 +106,9 @@ const NetworkCard = memo(
         <div className={classes.main}>
           <div className={classes.title}>
             <StatusCircle color={stateColor} tooltip={stateName} />
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
             {error && (
               <Tooltip
                 arrow
diff --git a/src/fireedge/src/client/components/Cards/NicCard.js b/src/fireedge/src/client/components/Cards/NicCard.js
index 0d4aa69910..f70e5636e2 100644
--- a/src/fireedge/src/client/components/Cards/NicCard.js
+++ b/src/fireedge/src/client/components/Cards/NicCard.js
@@ -97,6 +97,7 @@ const NicCard = memo(
         >
           <div className={classes.title}>
             <Typography
+              noWrap
               component="span"
               fontWeight="bold"
               data-cy={`${dataCy}-name`}
diff --git a/src/fireedge/src/client/components/Cards/ScheduleActionCard.js b/src/fireedge/src/client/components/Cards/ScheduleActionCard.js
index b56d2f934d..380a47bdf6 100644
--- a/src/fireedge/src/client/components/Cards/ScheduleActionCard.js
+++ b/src/fireedge/src/client/components/Cards/ScheduleActionCard.js
@@ -53,7 +53,9 @@ const ScheduleActionCard = memo(({ schedule, actions }) => {
     <Paper variant="outlined" className={classes.root}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{titleAction}</Typography>
+          <Typography noWrap component="span">
+            {titleAction}
+          </Typography>
           {MESSAGE && (
             <span className={classes.labels}>
               <StatusChip text={MESSAGE} />
diff --git a/src/fireedge/src/client/components/Cards/SecurityGroupCard.js b/src/fireedge/src/client/components/Cards/SecurityGroupCard.js
index fabfdde7ff..ab3b8d298c 100644
--- a/src/fireedge/src/client/components/Cards/SecurityGroupCard.js
+++ b/src/fireedge/src/client/components/Cards/SecurityGroupCard.js
@@ -52,7 +52,9 @@ const SecurityGroupCard = memo(
       <div {...rootProps} data-cy={`secgroup-${ID}`}>
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
           </div>
           <div className={classes.caption}>
             <span>{`#${ID}`}</span>
diff --git a/src/fireedge/src/client/components/Cards/SnapshotCard.js b/src/fireedge/src/client/components/Cards/SnapshotCard.js
index 85a1a53b76..1197fa3de1 100644
--- a/src/fireedge/src/client/components/Cards/SnapshotCard.js
+++ b/src/fireedge/src/client/components/Cards/SnapshotCard.js
@@ -35,7 +35,9 @@ const SnapshotCard = memo(
       <Paper variant="outlined" className={classes.root}>
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
           </div>
           <div className={classes.caption}>
             <span title={time.toFormat('ff')}>
diff --git a/src/fireedge/src/client/components/Cards/VmTemplateCard.js b/src/fireedge/src/client/components/Cards/VmTemplateCard.js
index edf62649db..4b6da13057 100644
--- a/src/fireedge/src/client/components/Cards/VmTemplateCard.js
+++ b/src/fireedge/src/client/components/Cards/VmTemplateCard.js
@@ -98,7 +98,9 @@ const VmTemplateCard = memo(
         </div>
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography component="span">{NAME}</Typography>
+            <Typography noWrap component="span">
+              {NAME}
+            </Typography>
             <span className={classes.labels}>
               {HYPERVISOR && <StatusChip text={HYPERVISOR} />}
               {LOCK && <Lock />}
diff --git a/src/fireedge/src/client/components/Tables/Clusters/row.js b/src/fireedge/src/client/components/Tables/Clusters/row.js
index f6517c450c..58c0cb727a 100644
--- a/src/fireedge/src/client/components/Tables/Clusters/row.js
+++ b/src/fireedge/src/client/components/Tables/Clusters/row.js
@@ -29,7 +29,9 @@ const Row = ({ original, value, ...props }) => {
     <div data-cy={`cluster-${ID}`} {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span>{`#${ID}`}</span>
diff --git a/src/fireedge/src/client/components/Tables/DockerHubTags/row.js b/src/fireedge/src/client/components/Tables/DockerHubTags/row.js
index a8687024bf..fdeb9fac43 100644
--- a/src/fireedge/src/client/components/Tables/DockerHubTags/row.js
+++ b/src/fireedge/src/client/components/Tables/DockerHubTags/row.js
@@ -95,7 +95,9 @@ const Row = ({ original, value: _, ...props }) => {
     <div {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{name}</Typography>
+          <Typography noWrap component="span">
+            {name}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span title={time.toFormat('ff')} className="full-width">
diff --git a/src/fireedge/src/client/components/Tables/Groups/row.js b/src/fireedge/src/client/components/Tables/Groups/row.js
index 11863636df..18be642d71 100644
--- a/src/fireedge/src/client/components/Tables/Groups/row.js
+++ b/src/fireedge/src/client/components/Tables/Groups/row.js
@@ -29,7 +29,9 @@ const Row = ({ original, value, ...props }) => {
     <div {...props} data-cy={`group-${ID}`}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span>{`#${ID}`}</span>
diff --git a/src/fireedge/src/client/components/Tables/Images/row.js b/src/fireedge/src/client/components/Tables/Images/row.js
index bc56a68a5d..42e70263cb 100644
--- a/src/fireedge/src/client/components/Tables/Images/row.js
+++ b/src/fireedge/src/client/components/Tables/Images/row.js
@@ -56,7 +56,7 @@ const Row = ({ original, value, ...props }) => {
       <div className={classes.main}>
         <div className={classes.title}>
           <StatusCircle color={stateColor} tooltip={stateName} />
-          <Typography component="span" data-cy="name">
+          <Typography noWrap component="span" data-cy="name">
             {NAME}
           </Typography>
           {LOCK && <Lock />}
diff --git a/src/fireedge/src/client/components/Tables/Users/row.js b/src/fireedge/src/client/components/Tables/Users/row.js
index 9408047097..4ce9200e95 100644
--- a/src/fireedge/src/client/components/Tables/Users/row.js
+++ b/src/fireedge/src/client/components/Tables/Users/row.js
@@ -29,7 +29,9 @@ const Row = ({ original, value, ...props }) => {
     <div {...props} data-cy={`user-${ID}`}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
           <span className={classes.labels}>{!+ENABLED && <Lock />}</span>
         </div>
         <div className={classes.caption}>
diff --git a/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js b/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js
index df418a81b2..2fb373636a 100644
--- a/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js
+++ b/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js
@@ -34,7 +34,9 @@ const Row = ({ original, value, ...props }) => {
     <div {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
           <span className={classes.labels}>{LOCK && <Lock />}</span>
         </div>
         <div className={classes.caption}>
diff --git a/src/fireedge/src/client/components/Tables/VRouters/row.js b/src/fireedge/src/client/components/Tables/VRouters/row.js
index d6e9f4154f..2770314f89 100644
--- a/src/fireedge/src/client/components/Tables/VRouters/row.js
+++ b/src/fireedge/src/client/components/Tables/VRouters/row.js
@@ -29,7 +29,9 @@ const Row = ({ original, value, ...props }) => {
     <div {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span>{`#${ID}`}</span>
diff --git a/src/fireedge/src/client/components/Tables/Wilds/row.js b/src/fireedge/src/client/components/Tables/Wilds/row.js
index 6c2cb64d22..123b543388 100644
--- a/src/fireedge/src/client/components/Tables/Wilds/row.js
+++ b/src/fireedge/src/client/components/Tables/Wilds/row.js
@@ -36,7 +36,9 @@ const Row = memo(({ original, ...props }) => {
     <div {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{VM_NAME}</Typography>
+          <Typography noWrap component="span">
+            {VM_NAME}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span>{`#${DEPLOY_ID}`}</span>
diff --git a/src/fireedge/src/client/components/Tables/Zombies/row.js b/src/fireedge/src/client/components/Tables/Zombies/row.js
index d7f834fee2..6ea175c70d 100644
--- a/src/fireedge/src/client/components/Tables/Zombies/row.js
+++ b/src/fireedge/src/client/components/Tables/Zombies/row.js
@@ -36,7 +36,9 @@ const Row = memo(({ original, ...props }) => {
     <div {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
-          <Typography component="span">{ZOMBIE_VM}</Typography>
+          <Typography noWrap component="span">
+            {ZOMBIE_VM}
+          </Typography>
         </div>
       </div>
     </div>
diff --git a/src/fireedge/src/client/components/Tables/Zones/row.js b/src/fireedge/src/client/components/Tables/Zones/row.js
index f5bdbddb67..128ed520b8 100644
--- a/src/fireedge/src/client/components/Tables/Zones/row.js
+++ b/src/fireedge/src/client/components/Tables/Zones/row.js
@@ -35,7 +35,9 @@ const Row = ({ original, value, ...props }) => {
       <div className={classes.main}>
         <div className={classes.title}>
           <StatusCircle color={stateColor} tooltip={stateName} />
-          <Typography component="span">{NAME}</Typography>
+          <Typography noWrap component="span">
+            {NAME}
+          </Typography>
         </div>
         <div className={classes.caption}>
           <span>{`#${ID}`}</span>
diff --git a/src/fireedge/src/client/components/Tables/styles.js b/src/fireedge/src/client/components/Tables/styles.js
index 2b38f30bd8..acb41e4087 100644
--- a/src/fireedge/src/client/components/Tables/styles.js
+++ b/src/fireedge/src/client/components/Tables/styles.js
@@ -50,7 +50,6 @@ export const rowStyles = makeStyles(
       display: 'flex',
       gap: 6,
       alignItems: 'center',
-      flexWrap: 'wrap',
     },
     labels: {
       display: 'inline-flex',
diff --git a/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js b/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
index 017b01e15c..448e55243c 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
@@ -88,7 +88,7 @@ const HistoryRecordCard = memo(
       <Paper variant="outlined" className={classes.root}>
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography component="span">
+            <Typography noWrap component="span">
               {`#${SEQ} | #${HID} ${HOSTNAME} | ${Tr(T.Action)}: ${action}`}
             </Typography>
           </div>