diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
index aef8ec2448..79160d09e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
@@ -19,6 +19,7 @@ import info.nightscout.androidaps.interfaces.ImportExportPrefsInterface
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -28,6 +29,7 @@ import info.nightscout.androidaps.utils.extensions.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class TreatmentsUserEntryFragment : DaggerFragment() {
@@ -66,14 +68,24 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
                 }
             }
         }
+        binding.showLoop.setOnCheckedChangeListener { _, _ ->
+            rxBus.send(EventTreatmentUpdateGui())
+        }
     }
 
     fun swapAdapter() {
-       disposable.add( repository
-            .getAllUserEntries()
-            .observeOn(aapsSchedulers.main)
-            .subscribe { list -> binding.recyclerview.swapAdapter(UserEntryAdapter(list), true) }
-       )
+        if (binding.showLoop.isChecked)
+            disposable.add( repository
+                .getAllUserEntries()
+                .observeOn(aapsSchedulers.main)
+                .subscribe { list -> binding.recyclerview.swapAdapter(UserEntryAdapter(list), true) }
+            )
+        else
+            disposable.add( repository
+                .getAllUserEntries()
+                .observeOn(aapsSchedulers.main)
+                .subscribe { list -> binding.recyclerview.swapAdapter(UserEntryAdapter(filterUserEntries(list)), true) }
+            )
     }
 
     @Synchronized
@@ -85,6 +97,11 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ swapAdapter() }, fabricPrivacy::logException))
+        disposable.add(rxBus
+            .toObservable(EventTreatmentUpdateGui::class.java)
+            .observeOn(aapsSchedulers.io)
+            .debounce(1L, TimeUnit.SECONDS)
+            .subscribe({ swapAdapter() }, fabricPrivacy::logException))
     }
 
     @Synchronized
@@ -165,6 +182,13 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
         }
 
         override fun getItemCount(): Int = entries.size
+    }
 
+    fun filterUserEntries(list: List<UserEntry>): List<UserEntry> {
+        val filteredList = mutableListOf<UserEntry>()
+        for (ue in list) {
+            if (! ue.isLoop()) filteredList.add(ue)
+        }
+        return filteredList
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/treatments_user_entry_fragment.xml b/app/src/main/res/layout/treatments_user_entry_fragment.xml
index f4b98829b8..53c9f9199c 100644
--- a/app/src/main/res/layout/treatments_user_entry_fragment.xml
+++ b/app/src/main/res/layout/treatments_user_entry_fragment.xml
@@ -1,18 +1,44 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".plugins.treatments.fragments.TreatmentsUserEntryFragment">
 
-    <info.nightscout.androidaps.utils.ui.SingleClickButton
-        android:id="@+id/ue_export_to_xml"
-        style="?android:attr/buttonStyle"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:drawableStart="@drawable/ic_header_export"
-        android:text="@string/ue_export_to_csv" />
+        android:orientation="horizontal">
+
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/ue_export_to_xml"
+            style="?android:attr/buttonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:drawableStart="@drawable/ic_header_export"
+            android:text="@string/ue_export_to_csv" />
+
+        <CheckBox
+            android:id="@+id/show_loop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:checked="false"
+            android:paddingEnd="5dp"
+            tools:ignore="RtlSymmetry" />
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/show_calculation"
+            app:srcCompat="@drawable/ic_loop_closed_white" />
+
+
+    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
index 863f698d54..ad91b61507 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
@@ -180,4 +180,12 @@ data class UserEntry(
         Pump,
         Aaps
     }
+
+    fun isLoop(): Boolean {
+        var result = false
+        for (v in values) {
+            if (v.unit == Units.Source && Sources.fromText(v.sValue).equals(Sources.Loop)) result = true
+        }
+        return result
+    }
 }
\ No newline at end of file