diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index ecb81054020901e4f504f144d634b845d3e3440f..ad8f09e9e8775964e77a5913c514e4b3dba55231 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -53,10 +53,6 @@
 
     <PreferenceCategory
         android:title="@string/Show_applications">
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="showAllApplications"
-            android:title="@string/Show_commercial_apps" />
 
         <CheckBoxPreference
             android:defaultValue="true"
@@ -67,6 +63,11 @@
             android:defaultValue="true"
             android:key="showPWAApplications"
             android:title="@string/show_only_pwa_apps" />
+        
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="showAllApplications"
+            android:title="@string/Show_commercial_apps" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/app/src/test/java/foundation/e/apps/util/LiveDataTestUtil.kt b/app/src/test/java/foundation/e/apps/util/LiveDataTestUtil.kt
index 679cc04e20a3f9ee6028459e0d239150f0cf790a..58e478c3403c125ee73da31fa21ff648d4d1fcc1 100644
--- a/app/src/test/java/foundation/e/apps/util/LiveDataTestUtil.kt
+++ b/app/src/test/java/foundation/e/apps/util/LiveDataTestUtil.kt
@@ -20,8 +20,6 @@ package foundation.e.apps.util
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import kotlinx.coroutines.delay
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 /**
  * Gets the value of a [LiveData] or waits for it to have one, with a timeout.