diff --git a/shared/chat/conversation/messages/message-popup/text.tsx b/shared/chat/conversation/messages/message-popup/text.tsx
index 3a8c7f28077d..a28db313dfc2 100644
--- a/shared/chat/conversation/messages/message-popup/text.tsx
+++ b/shared/chat/conversation/messages/message-popup/text.tsx
@@ -33,6 +33,8 @@ const PopText = (ownProps: OwnProps) => {
     switch (message.type) {
       case 'text':
         return message.text.stringValue()
+      case 'setDescription':
+        return message.newDescription.stringValue() || undefined
       case 'systemGitPush':
         switch (message.pushType) {
           case T.RPCGen.GitPushType.createrepo:
diff --git a/shared/common-adapters/markdown/index.tsx b/shared/common-adapters/markdown/index.tsx
index 35203c8cb7e7..a310247b793b 100644
--- a/shared/common-adapters/markdown/index.tsx
+++ b/shared/common-adapters/markdown/index.tsx
@@ -71,7 +71,7 @@ export type Props = {
   context?: string // metadata used for bookkeeping
   children?: string
   lineClamp?: LineClampType
-  selectable?: boolean // desktop - applies to outer container only
+  selectable?: boolean
   smallStandaloneEmoji?: boolean // don't increase font size for a standalone emoji
   paragraphTextClassName?: string
   preview?: boolean // if true render a simplified version
@@ -447,6 +447,7 @@ const SimpleMarkdownComponent = React.memo(function SimpleMarkdownComponent(p: M
       disallowAnimation,
       messageType,
       paragraphTextClassName,
+      selectable,
       styleOverride,
       virtualText,
     }
diff --git a/shared/common-adapters/markdown/react.tsx b/shared/common-adapters/markdown/react.tsx
index c48a4dd516fc..eeb1075f2ee1 100644
--- a/shared/common-adapters/markdown/react.tsx
+++ b/shared/common-adapters/markdown/react.tsx
@@ -23,6 +23,7 @@ interface State {
   disallowAnimation?: boolean
   messageType?: T.Chat.MessageType
   paragraphTextClassName?: string
+  selectable?: boolean
   styleOverride?: StyleOverride
   virtualText?: boolean
   key?: string | number | undefined
@@ -335,6 +336,7 @@ const reactComponentsForMarkdownType = {
             state.inBlockQuote && markdownStyles.quoteStyleText,
           ])}
           allowFontScaling={state.allowFontScaling}
+          selectable={state.selectable}
         >
           {output(node['content'], state)}
         </Text>