diff --git a/effects/effectrow.cpp b/effects/effectrow.cpp
index 06b998d66..912d25ad2 100644
--- a/effects/effectrow.cpp
+++ b/effects/effectrow.cpp
@@ -60,11 +60,6 @@ bool EffectRow::IsKeyframing() {
 }
 
 void EffectRow::SetKeyframingInternal(bool b) {
-  // No need to run this function if the keyframing state isn't actually changing.
-  if (b == keyframing_) {
-    return;
-  }
-
   if (GetParentEffect()->meta->type != EFFECT_TYPE_TRANSITION) {
     keyframing_ = b;
     emit KeyframingSetChanged(keyframing_);
@@ -127,7 +122,6 @@ void EffectRow::SetKeyframingEnabled(bool enabled) {
 
     } else {
 
-
       SetKeyframingInternal(true);
 
     }
diff --git a/ui/sourceiconview.cpp b/ui/sourceiconview.cpp
index 4916a653a..3ed554c4c 100644
--- a/ui/sourceiconview.cpp
+++ b/ui/sourceiconview.cpp
@@ -76,16 +76,15 @@ void SourceIconView::dropEvent(QDropEvent* event) {
 }
 
 void SourceIconView::mouseDoubleClickEvent(QMouseEvent *) {
-  bool default_behavior = true;
   if (selectedIndexes().size() == 1) {
     Media* m = project_parent->item_to_media(selectedIndexes().at(0));
     if (m->get_type() == MEDIA_TYPE_FOLDER) {
-      default_behavior = false;
       setRootIndex(selectedIndexes().at(0));
       emit changed_root();
+      return;
     }
   }
-  if (default_behavior) {
-    commons_.mouseDoubleClickEvent(selectedIndexes());
-  }
+
+  // Double click was not a folder, so we perform the default behavior (sending the double click to SourcesCommon)
+  commons_.mouseDoubleClickEvent(selectedIndexes());
 }