diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp
index a358691ab..98fd01e11 100644
--- a/panels/effectcontrols.cpp
+++ b/panels/effectcontrols.cpp
@@ -602,20 +602,7 @@ void EffectControls::SetClips()
   Clear(true);
 
   // replace clip vector
-  selected_clips_ = olive::ActiveSequence->SelectedClips();
-
-  if (selected_clips_.isEmpty()) {
-    // If no clips are selected, there may be transitions that are
-    for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
-      Clip* c = olive::ActiveSequence->clips.at(i).get();
-      if (c != nullptr) {
-        if (olive::ActiveSequence->IsTransitionSelected(c->opening_transition.get())
-            || olive::ActiveSequence->IsTransitionSelected(c->closing_transition.get())) {
-          selected_clips_.append(c);
-        }
-      }
-    }
-  }
+  selected_clips_ = olive::ActiveSequence->SelectedClips(false);
 
   Load();
 }
diff --git a/timeline/sequence.cpp b/timeline/sequence.cpp
index 6ad7bc9a9..5f3a69e71 100644
--- a/timeline/sequence.cpp
+++ b/timeline/sequence.cpp
@@ -87,13 +87,13 @@ void Sequence::RefreshClips(Media *m) {
   }
 }
 
-QVector<Clip *> Sequence::SelectedClips()
+QVector<Clip *> Sequence::SelectedClips(bool containing)
 {
   QVector<Clip*> selected_clips;
 
   for (int i=0;i<clips.size();i++) {
     Clip* c = clips.at(i).get();
-    if (c != nullptr && IsClipSelected(c, true)) {
+    if (c != nullptr && IsClipSelected(c, containing)) {
       selected_clips.append(c);
     }
   }
diff --git a/timeline/sequence.h b/timeline/sequence.h
index 99c642410..f4e2e5518 100644
--- a/timeline/sequence.h
+++ b/timeline/sequence.h
@@ -43,7 +43,7 @@ public:
   int audio_layout;
 
   void RefreshClips(Media* m = nullptr);
-  QVector<Clip*> SelectedClips();
+  QVector<Clip*> SelectedClips(bool containing = true);
   QVector<int> SelectedClipIndexes();
 
   Effect* GetSelectedGizmo();