diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index 1cb66ab..22fb768 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -917,10 +917,11 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                                 if (hashtag.startsWith('#')) {
                                   hashtag = hashtag.substring(1);
                                 }
-                                final channelName = '#$hashtag';
+                                final String channelName;
                                 
                                 final Uint8List psk;
                                 if (isRegularHashtag) {
+                                  channelName = '#$hashtag';
                                   // Regular hashtag - public derivation using SHA256
                                   psk = Channel.derivePskFromHashtag(hashtag);
                                 } else {
@@ -931,6 +932,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                                     );
                                     return;
                                   }
+                                  channelName = '${selectedCommunity!.name} #$hashtag';
                                   psk = selectedCommunity!.deriveCommunityHashtagPsk(hashtag);
                                   // Track in community's hashtag list
                                   await _communityStore.addHashtagChannel(selectedCommunity!.id, hashtag);