diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
index 4585b00..b40f29f 100644
--- a/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
@@ -66,6 +66,7 @@ public class AlarmActivity extends Activity {
 		setContentView(R.layout.tabalarm);
 
 		gridView = findViewById(R.id.gridViewAlarms);
+		gridView.setNestedScrollingEnabled(true);
 		adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
 		gridView.setAdapter(adapter);
 
@@ -171,7 +172,10 @@ public class AlarmActivity extends Activity {
 		if (param.equals(ALARM)) {
 			// set adapter
 			adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+			int position = gridView.getFirstVisiblePosition();
+
 			gridView.setAdapter(adapter);
+			gridView.setSelection(position);
 		} else {
 			adapter.changeACK(ackPosition);
 			SM.Debug("Set ACK: " + ackPosition + "  | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false"));