diff --git a/lib/features/scene/widgets/alert_dialogs/alert_dialog_countdown.dart b/lib/features/scene/widgets/alert_dialogs/alert_dialog_countdown.dart
index e83e9a1..73371a0 100644
--- a/lib/features/scene/widgets/alert_dialogs/alert_dialog_countdown.dart
+++ b/lib/features/scene/widgets/alert_dialogs/alert_dialog_countdown.dart
@@ -60,8 +60,11 @@ class _AlertDialogCountdownState extends State<AlertDialogCountdown> {
           setState(() {
             durationInSeconds = newDuration.inSeconds;
           });
-          context.read<CreateSceneBloc>().add(
-              SelectedValueEvent(value: newDuration.inSeconds, code: 'delay'));
+          context.read<CreateSceneBloc>().add(SelectedValueEvent(
+              value: newDuration.inSeconds,
+              code: widget.function.deviceId == 'delay'
+                  ? 'delay'
+                  : widget.function.code));
         },
       ),
     );
diff --git a/lib/features/scene/widgets/bottom_sheet_widget.dart b/lib/features/scene/widgets/bottom_sheet_widget.dart
index 2b3ba88..9ef5408 100644
--- a/lib/features/scene/widgets/bottom_sheet_widget.dart
+++ b/lib/features/scene/widgets/bottom_sheet_widget.dart
@@ -126,6 +126,7 @@ class CustomBottomSheetWidget extends StatelessWidget {
             ));
         context.read<CreateSceneBloc>().add(AddTaskEvent());
         Navigator.pop(context);
+        Navigator.pop(context);
       },
       onDismiss: () {
         final tempTaskList = context.read<CreateSceneBloc>().tempTasksList;