diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index 4d9ce5b6e..e3d56034b 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -324,11 +324,11 @@ void Timeline::add_clips_from_ghosts(ComboAction* ca, Sequence* s) {
 
 		if (c->track < 0) {
 			// add default video effects
-			c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM)));
+            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
 		} else {
 			// add default audio effects
-			c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME)));
-			c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN)));
+            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
+            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
 		}
 	}
 	if (config.enable_seek_to_import) {
@@ -355,11 +355,11 @@ void Timeline::add_transition() {
         Clip* c = sequence->clips.at(i);
         if (c != NULL && is_clip_selected(c, true)) {
             if (c->get_opening_transition() == NULL) {
-                ca->append(new AddTransitionCommand(c, NULL, NULL, get_internal_meta(TRANSITION_INTERNAL_LINEARFADE), TA_OPENING_TRANSITION, 30));
+                ca->append(new AddTransitionCommand(c, NULL, NULL, get_internal_meta(TRANSITION_INTERNAL_LINEARFADE, EFFECT_TYPE_TRANSITION), TA_OPENING_TRANSITION, 30));
 				adding = true;
             }
             if (c->get_closing_transition() == NULL) {
-                ca->append(new AddTransitionCommand(c, NULL, NULL, get_internal_meta(TRANSITION_INTERNAL_LINEARFADE), TA_OPENING_TRANSITION, 30));
+                ca->append(new AddTransitionCommand(c, NULL, NULL, get_internal_meta(TRANSITION_INTERNAL_LINEARFADE, EFFECT_TYPE_TRANSITION), TA_OPENING_TRANSITION, 30));
 				adding = true;
             }
         }
diff --git a/project/effect.cpp b/project/effect.cpp
index c4c67fa9d..f1d1fc30b 100644
--- a/project/effect.cpp
+++ b/project/effect.cpp
@@ -66,14 +66,14 @@ Effect* create_effect(Clip* c, const EffectMeta* em) {
 	return NULL;
 }
 
-const EffectMeta* get_internal_meta(int internal_id) {
+const EffectMeta* get_internal_meta(int internal_id, int type) {
 	for (int i=0;i<audio_effects.size();i++) {
-		if (audio_effects.at(i).internal == internal_id) {
+        if (audio_effects.at(i).internal == internal_id && audio_effects.at(i).type == type) {
 			return &audio_effects.at(i);
 		}
 	}
 	for (int i=0;i<video_effects.size();i++) {
-		if (video_effects.at(i).internal == internal_id) {
+        if (video_effects.at(i).internal == internal_id && video_effects.at(i).type == type) {
 			return &video_effects.at(i);
 		}
 	}
diff --git a/project/effect.h b/project/effect.h
index 0caf160ce..9c8eb062b 100644
--- a/project/effect.h
+++ b/project/effect.h
@@ -38,7 +38,7 @@ extern QVector<EffectMeta> audio_effects;
 double log_volume(double linear);
 void init_effects();
 Effect* create_effect(Clip* c, const EffectMeta *em);
-const EffectMeta* get_internal_meta(int internal_id);
+const EffectMeta* get_internal_meta(int internal_id, int type);
 
 extern QMutex effects_loaded;
 
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 0a56b83b4..bd990f19b 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -772,41 +772,41 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
 
 						if (c->track < 0) {
 							// default video effects (before custom effects)
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
 							c->media_type = MEDIA_TYPE_SOLID;
 						}
 
 						switch (panel_timeline->creating_object) {
 						case ADD_OBJ_TITLE:
 							c->name = "Title";
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TEXT)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TEXT, EFFECT_TYPE_EFFECT)));
 							break;
 						case ADD_OBJ_SOLID:
 							c->name = "Solid Color";
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT)));
 							break;
 						case ADD_OBJ_BARS:
                         {
 							c->name = "Bars";
-							Effect* e = create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID));
+                            Effect* e = create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT));
                             e->row(0)->field(0)->set_combo_index(1);
 							c->effects.append(e);
                         }
 							break;
 						case ADD_OBJ_TONE:
 							c->name = "Tone";
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TONE)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TONE, EFFECT_TYPE_EFFECT)));
 							break;
 						case ADD_OBJ_NOISE:
 							c->name = "Noise";
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_NOISE)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_NOISE, EFFECT_TYPE_EFFECT)));
 							break;
 						}
 
 						if (c->track >= 0) {
 							// default audio effects (after custom effects)
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME)));
-							c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
+                            c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
 							c->media_type = MEDIA_TYPE_TONE;
 						}