diff --git a/NEWS b/NEWS
index 53bbcbc9..d35e5c0e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+* #3364: When joining an activity, pick up its sharing scope, so we don't
+  try to re-share already shared activities in order to invite someone (smcv)
+
 Snapshot 8b784a6223
 
 * #3339 Add default mime types handler to the shell. (marco)
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index 4bda7eb7..f18cb1ca 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -520,11 +520,15 @@ class Activity(Window, gtk.Container):
         if not success:
             logging.debug("Failed to join activity: %s" % err)
             return
+        if self._shared_activity.props.private:
+            self._share_scope = SCOPE_INVITE_ONLY
+        else:
+            self._share_scope = SCOPE_NEIGHBORHOOD
+
         self.present()
         self.emit('joined')
         if self._jobject:
-            # FIXME: some way to distinguish between share scopes
-            self._jobject.metadata['share-scope'] = SCOPE_NEIGHBORHOOD
+            self._jobject.metadata['share-scope'] = self._share_scope
 
     def get_shared(self):
         """Returns TRUE if the activity is shared on the mesh."""