diff --git a/lib/features/tags/tag_detail_sheet.dart b/lib/features/tags/tag_detail_sheet.dart
index f67a40c..7ab70f1 100644
--- a/lib/features/tags/tag_detail_sheet.dart
+++ b/lib/features/tags/tag_detail_sheet.dart
@@ -174,7 +174,9 @@ class _TagDetailSheetState extends ConsumerState<TagDetailSheet> {
                     ref.read(trackedTagProvider.notifier).state = isTracking
                         ? null
                         : tag;
-                    // TODO: move screen to floor plan
+                    if (!isTracking) {
+                      GoRouter.of(context).go('/floorplan');
+                    }
                   },
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,