diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm
index 08415a9ef0ace50e39962f75e2395fc3f76728e8..d6c0ba2919d91f8df2cc8fa29dd9c1b96080389d 100644
--- a/lib/Tails/Persistence/Setup.pm
+++ b/lib/Tails/Persistence/Setup.pm
@@ -29,7 +29,7 @@ use Glib qw{TRUE FALSE};
 use Gtk3 qw{-init};
 use Net::DBus qw(:typing);
 use Net::DBus::Annotation qw(:call);
-use List::Util qw{max};
+use List::Util qw{first max};
 use Number::Format qw(:subs);
 use Path::Class;
 use Try::Tiny;
@@ -246,9 +246,10 @@ sub _build_main_window {
 sub _build_persistence_partition_mountpoint {
     my $self = shift;
 
-    my @mountpoints = $self->mountpoints($self->persistence_partition);
-
-    return $mountpoints[0];
+    first {
+           $_ eq '/live/persistence/TailsData_unlocked'
+        or $_ eq '/media/tails-persistence-setup/TailsData'
+    } $self->mountpoints($self->persistence_partition);
 }
 
 sub _build_beginning_of_free_space {