diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index 899f3f5e5e4..7df99bd59bb 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -75,6 +75,7 @@ void DesignerSettings::fromSettings(QSettings *settings)
     restoreValue(settings, DesignerSettingsKey::STATESEDITOR_EXPANDED, true);
     restoreValue(settings, DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS, true);
     restoreValue(settings, DesignerSettingsKey::STANDALONE_MODE, false);
+    restoreValue(settings, DesignerSettingsKey::ENABLE_TIMELINEVIEW, false);
 
     settings->endGroup();
     settings->endGroup();
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index 924b5690195..bdaa22bb4b2 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -64,6 +64,7 @@ const char NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS[] = "NavigatorShowOnlyVisibleItems"
 const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles";        /* These settings are not exposed in ui. */
 const char IGNORE_DEVICE_PIXEL_RATIO[] = "IgnoreDevicePixelRaio"; /* The settings can be used to turn off the feature, if there are serious issues */
 const char STANDALONE_MODE[] = "StandAloneMode";
+const char ENABLE_TIMELINEVIEW[] = "EnableTimelineView";
 }
 
 class DesignerSettings : public QHash<QByteArray, QVariant>
diff --git a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension.pri b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension.pri
index c30f7d64a1a..597bd853389 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension.pri
+++ b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension.pri
@@ -8,7 +8,5 @@ include(sourcetool/sourcetool.pri)
 include(colortool/colortool.pri)
 include(texttool/texttool.pri)
 include(pathtool/pathtool.pri)
-
+include(timelineeditor/timelineeditor.pri)
 include(connectioneditor/connectioneditor.pri)
-
-
diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineeditor.pri b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineeditor.pri
index a6f05493f32..8001748fb00 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineeditor.pri
+++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineeditor.pri
@@ -18,7 +18,6 @@ SOURCES += \
     timelineabstracttool.cpp \
     timelinemovetool.cpp \
     timelineselectiontool.cpp \
-    timelineplugin.cpp \
     timelineplaceholder.cpp \
     setframevaluedialog.cpp \
     timelinetoolbar.cpp \
@@ -52,7 +51,6 @@ HEADERS += \
     timelineabstracttool.h \
     timelinemovetool.h \
     timelineselectiontool.h \
-    timelineplugin.h \
     timelineplaceholder.h \
     timelineicons.h \
     timelinetoolbar.h \
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index abb432ec74f..84b95cccc3b 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -36,6 +36,7 @@
 #include <sourcetool/sourcetool.h>
 #include <colortool/colortool.h>
 #include <texttool/texttool.h>
+#include <timelineeditor/timelineview.h>
 #include <pathtool/pathtool.h>
 
 #include <qmljseditor/qmljseditorconstants.h>
@@ -192,7 +193,9 @@ bool QmlDesignerPlugin::delayedInitialize()
 
     d->settings.fromSettings(Core::ICore::settings());
 
-    d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView());
+    d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView);
+    if (DesignerSettings::getValue(DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool())
+        d->viewManager.registerViewTakingOwnership(new QmlDesigner::TimelineView);
     d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool);
     d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool);
     d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool);