diff --git a/lib/main.dart b/lib/main.dart
index 9eed1fc..1cc664a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -298,6 +298,7 @@ class _HomeScreenState extends State<HomeScreen> {
       );
       await Alarm.set(alarmSettings: settings);
       // End Alarm Method ***/
+      _showSnack('Alarm Scheduled @ ${alarmTime}');
     } else {
       _showSnack('Platform not detected, unsure how to show alarm.');
     }
@@ -441,6 +442,9 @@ class _HomeScreenState extends State<HomeScreen> {
                       final val = _validateTime(v);
                       if (val == null) {
                         _savePrefs();
+                        if (_alarmEnabled) {
+                          _scheduleAlarm();
+                        }
                       }
                       setState(() {
                         _sunsetErrorText = val;
@@ -459,7 +463,14 @@ class _HomeScreenState extends State<HomeScreen> {
                           )
                           : const Icon(Icons.cloud_done_outlined),
                   tooltip: 'Fetch Sunset Time from Open-Meteo',
-                  onPressed: _loading ? null : _fetchSunset,
+                  onPressed: () {
+                    if (!_loading) {
+                      _fetchSunset();
+                      if (_alarmEnabled) {
+                        _scheduleAlarm();
+                      }
+                    }
+                  },
                 ),
               ],
             ),