diff --git a/src/copy-to-clipboard/internal.tsx b/src/copy-to-clipboard/internal.tsx
index c280637620..1fe1bdaac1 100644
--- a/src/copy-to-clipboard/internal.tsx
+++ b/src/copy-to-clipboard/internal.tsx
@@ -63,7 +63,7 @@ export default function InternalCopyToClipboard({
   const isInline = variant === 'inline';
   const trigger = (
     <InternalPopover
-      className={clsx(isInline && styles['inline-trigger'])}
+      isInline={isInline}
       size="medium"
       position="top"
       triggerType="custom"
diff --git a/src/copy-to-clipboard/styles.scss b/src/copy-to-clipboard/styles.scss
index f2bb34cb2f..b6f3a20b09 100644
--- a/src/copy-to-clipboard/styles.scss
+++ b/src/copy-to-clipboard/styles.scss
@@ -16,7 +16,3 @@
     margin-inline-end: awsui.$space-scaled-xxs;
   }
 }
-
-.inline-trigger {
-  white-space: nowrap;
-}
diff --git a/src/internal/styles/utils/styles-reset.scss b/src/internal/styles/utils/styles-reset.scss
index f78223c3af..86f1c19cdf 100644
--- a/src/internal/styles/utils/styles-reset.scss
+++ b/src/internal/styles/utils/styles-reset.scss
@@ -14,12 +14,9 @@
   direction: inherit;
   empty-cells: show;
   font-family: serif;
-  font-size: medium;
   font-style: normal;
   font-variant: normal;
-  font-weight: 400;
   font-stretch: normal;
-  line-height: normal;
   hyphens: none;
   letter-spacing: normal;
   list-style: disc outside none;
diff --git a/src/popover/internal.tsx b/src/popover/internal.tsx
index 9f6e595865..a371d5dda1 100644
--- a/src/popover/internal.tsx
+++ b/src/popover/internal.tsx
@@ -28,6 +28,7 @@ export interface InternalPopoverProps extends Omit<PopoverProps, 'triggerType' |
   triggerType?: PopoverProps.TriggerType | 'filtering-token';
   size: PopoverProps.Size | 'content';
   __closeAnalyticsAction?: string;
+  isInline?: boolean;
 }
 
 export interface InternalPopoverRef {
@@ -51,11 +52,13 @@ function InternalPopover(
     triggerAriaLabel,
 
     wrapTriggerText = true,
+    isInline = false,
     renderWithPortal = false,
 
     __onOpen,
     __internalRootRef = null,
     __closeAnalyticsAction,
+
     ...restProps
   }: InternalPopoverProps,
   ref: React.Ref<InternalPopoverRef>
@@ -186,7 +189,8 @@ function InternalPopover(
       className={clsx(
         styles.root,
         baseProps.className,
-        triggerType === 'filtering-token' && styles['root-filtering-token']
+        triggerType === 'filtering-token' && styles['root-filtering-token'],
+        isInline && styles['no-wrap']
       )}
       ref={mergedRef}
       onMouseDown={() => {
diff --git a/src/popover/styles.scss b/src/popover/styles.scss
index 669d44a93b..34c6f92b1c 100644
--- a/src/popover/styles.scss
+++ b/src/popover/styles.scss
@@ -15,6 +15,9 @@
 .root {
   @include styles.styles-reset;
   color: inherit;
+  &.no-wrap {
+    white-space: nowrap;
+  }
 }
 
 .root-filtering-token {