diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index 9b73dc1faf8..bdaa22bb4b2 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -65,7 +65,6 @@ const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles";        /* These setti
 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";
-const char ENABLE_TIMELINEVIEW_ENVVAR[] = "QTC_ENABLE_QTQUICKTIMELINE_EDITOR";
 }
 
 class DesignerSettings : public QHash<QByteArray, QVariant>
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 09e10c3b0c1..84b95cccc3b 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -194,8 +194,7 @@ bool QmlDesignerPlugin::delayedInitialize()
     d->settings.fromSettings(Core::ICore::settings());
 
     d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView);
-    if (DesignerSettings::getValue(DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool()
-        || qEnvironmentVariableIsSet(DesignerSettingsKey::ENABLE_TIMELINEVIEW_ENVVAR))
+    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);
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index e9bd2d1cb46..a7d6bc2bb09 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -159,6 +159,8 @@ DesignerSettings SettingsPageWidget::settings() const
         m_ui.showPropertyEditorWarningsCheckBox->isChecked());
     settings.insert(DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT,
         m_ui.showWarnExceptionsCheckBox->isChecked());
+    settings.insert(DesignerSettingsKey::ENABLE_TIMELINEVIEW,
+                    m_ui.featureTimelineEditorCheckBox->isChecked());
 
     return settings;
 }
@@ -224,9 +226,13 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings)
 
     m_ui.controls2StyleComboBox->setCurrentText(m_ui.styleLineEdit->text());
 
+    m_ui.featureTimelineEditorCheckBox->setChecked(settings.value(
+        DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool());
+
     if (settings.value(DesignerSettingsKey::STANDALONE_MODE).toBool()) {
         m_ui.emulationGroupBox->hide();
         m_ui.debugGroupBox->hide();
+        m_ui.featuresGroupBox->hide();
     }
 }
 
@@ -262,7 +268,8 @@ void SettingsPage::apply()
                          << DesignerSettingsKey::PUPPET_KILL_TIMEOUT
                          << DesignerSettingsKey::FORWARD_PUPPET_OUTPUT
                          << DesignerSettingsKey::DEBUG_PUPPET
-                         << DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT;
+                         << DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT
+                         << DesignerSettingsKey::ENABLE_TIMELINEVIEW;
 
     foreach (const QByteArray &key, restartNecessaryKeys) {
         if (currentSettings.value(key) != newSettings.value(key)) {
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui
index 567f0f7d80e..7da62b300aa 100644
--- a/src/plugins/qmldesigner/settingspage.ui
+++ b/src/plugins/qmldesigner/settingspage.ui
@@ -410,6 +410,22 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QGroupBox" name="featuresGroupBox">
+     <property name="title">
+      <string>Features</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <item>
+       <widget class="QCheckBox" name="featureTimelineEditorCheckBox">
+        <property name="text">
+         <string>Enable Timeline editor</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="debugGroupBox">
      <property name="title">