diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index 6a47c26983b55e5b99b3aafb1ae22b780e7314ed..9a38d982f539e7db632e01ee459249fe67081593 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -1384,8 +1384,15 @@ class Clip(Gtk.EventBox, Zoomable, Loggable):
         else:
             self.app.gui.editor.switch_context_tab(self.ges_clip)
 
-        parent = self.ges_clip.get_toplevel_parent()
-        if parent is self.ges_clip:
+        parent = self.ges_clip.get_parent()  # returns parent group
+
+        # If the clip selected doesn't belong to any group,
+        # then select/unselect that clip only.
+        if (
+            parent is None or
+            # Need this because selected clips are temporarily grouped together.
+            mode == UNSELECT and parent == self.ges_clip.get_toplevel_parent()
+        ):
             selection = [self.ges_clip]
         else:
             selection = [elem for elem in parent.get_children(True)