diff --git a/lib/ui/password_reentry_page.dart b/lib/ui/password_reentry_page.dart
index 8c010064b..c61bb71a1 100644
--- a/lib/ui/password_reentry_page.dart
+++ b/lib/ui/password_reentry_page.dart
@@ -18,7 +18,7 @@ class PasswordReentryPage extends StatefulWidget {
 
 class _PasswordReentryPageState extends State<PasswordReentryPage> {
   final _passwordController = TextEditingController();
-  FocusNode _passwordFocusNode = FocusNode();
+  final FocusNode _passwordFocusNode = FocusNode();
   bool _passwordInFocus = false;
   bool _passwordVisible = false;
 
diff --git a/lib/ui/progress_dialog.dart b/lib/ui/progress_dialog.dart
index 0d8aeae1e..c4a6bfc55 100644
--- a/lib/ui/progress_dialog.dart
+++ b/lib/ui/progress_dialog.dart
@@ -180,7 +180,7 @@ class ProgressDialog {
 
 // ignore: must_be_immutable
 class _Body extends StatefulWidget {
-  _BodyState _dialog = _BodyState();
+  final _BodyState _dialog = _BodyState();
 
   update() {
     _dialog.update();
diff --git a/lib/ui/shared_collections_gallery.dart b/lib/ui/shared_collections_gallery.dart
index 14deb8e8e..db59191f6 100644
--- a/lib/ui/shared_collections_gallery.dart
+++ b/lib/ui/shared_collections_gallery.dart
@@ -31,7 +31,7 @@ class SharedCollectionGallery extends StatefulWidget {
 
 class _SharedCollectionGalleryState extends State<SharedCollectionGallery>
     with AutomaticKeepAliveClientMixin {
-  Logger _logger = Logger("SharedCollectionGallery");
+  final Logger _logger = Logger("SharedCollectionGallery");
   StreamSubscription<LocalPhotosUpdatedEvent> _localFilesSubscription;
   StreamSubscription<CollectionUpdatedEvent> _collectionUpdatesSubscription;
   StreamSubscription<UserLoggedOutEvent> _loggedOutEvent;