diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2917060cb9..f30509728f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,16 +68,6 @@
         <activity
             android:name=".activities.PreferencesActivity"
             android:exported="false" />
-        <activity
-            android:name="info.nightscout.plugins.general.overview.activities.QuickWizardListActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme">
-            <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".plugins.general.maintenance.activities.PrefImportListActivity"
             android:exported="false"
@@ -147,10 +137,6 @@
             android:name=".services.AlarmSoundService"
             android:enabled="true"
             android:exported="true" />
-        <service
-            android:name="info.nightscout.plugins.general.overview.notifications.DismissNotificationService"
-            android:exported="false" />
-
         <service android:name=".plugins.general.persistentNotification.DummyService" />
 
         <activity
diff --git a/plugins/main/src/main/AndroidManifest.xml b/plugins/main/src/main/AndroidManifest.xml
index ba49e1afa5..5469c7ce47 100644
--- a/plugins/main/src/main/AndroidManifest.xml
+++ b/plugins/main/src/main/AndroidManifest.xml
@@ -22,11 +22,26 @@
             android:name=".source.activities.RequestDexcomPermissionActivity"
             android:exported="false" />
 
+        <activity
+            android:name="info.nightscout.plugins.general.overview.activities.QuickWizardListActivity"
+            android:exported="false"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name=".sync.nsclient.services.NSClientService"
             android:enabled="true"
             android:exported="true" />
 
+        <service
+            android:name="info.nightscout.plugins.general.overview.notifications.DismissNotificationService"
+            android:exported="false" />
+
         <service
             android:name=".general.wear.wearintegration.DataLayerListenerServiceMobile"
             android:exported="true">