diff --git a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
index 4d7f71c..17c1c1c 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
@@ -74,6 +74,8 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         findViewById(R.id.workoutListRecordHiking) .setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_HIKING));
         findViewById(R.id.workoutListRecordCycling).setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_CYCLING));
 
+        loadData();
+
         checkFirstStart();
 
         adapter= new WorkoutAdapter(workouts, this);
diff --git a/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
index 50e6c7e..fa4d3f4 100644
--- a/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
@@ -356,11 +356,13 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
 
     @Override
     public void onGPSStateChanged(WorkoutRecorder.GpsState oldState, WorkoutRecorder.GpsState state) {
-        mHandler.post(() -> gpsStatusView.setTextColor(state.color));
-        if(!gpsFound && (state != WorkoutRecorder.GpsState.SIGNAL_LOST)){
-            gpsFound= true;
-            hideWaitOverlay();
-        }
+        mHandler.post(() -> {
+            gpsStatusView.setTextColor(state.color);
+            if(!gpsFound && (state != WorkoutRecorder.GpsState.SIGNAL_LOST)){
+                gpsFound= true;
+                hideWaitOverlay();
+            }
+        });
     }
 
     public static class InfoViewHolder{