diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp
index eb5a4e20a..468fb43b5 100644
--- a/panels/effectcontrols.cpp
+++ b/panels/effectcontrols.cpp
@@ -111,9 +111,9 @@ void EffectControls::copy(bool del) {
                 Effect* effect = c->effects.at(j);
                 if (effect->container->selected) {
                     if (!cleared) {
-                        clipboard_type = CLIPBOARD_TYPE_EFFECT;
                         clear_clipboard();
                         cleared = true;
+						clipboard_type = CLIPBOARD_TYPE_EFFECT;
                     }
 
                     clipboard.append(effect->copy(NULL));
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index e96b87fc2..7a8ee4fbe 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -1283,8 +1283,10 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
 				if (validator < 1) frame_diff -= (1 - validator);
 
 				// prevent timeline in from going below 0
-				validator = g.old_in + frame_diff;
-				if (validator < 0) frame_diff -= validator;
+				if (panel_timeline->tool != TIMELINE_TOOL_RIPPLE) {
+					validator = g.old_in + frame_diff;
+					if (validator < 0) frame_diff -= validator;
+				}
 
 				// prevent clip_in from going below 0
                 if (c->media->get_type() == MEDIA_TYPE_SEQUENCE