diff --git a/MyTracks/src/com/google/android/apps/mytracks/Eula.java b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
index 933e3498e..aed5a40a0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Eula.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
@@ -21,6 +21,7 @@ import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -51,7 +52,6 @@ class Eula {
     }
 
     final AlertDialog.Builder builder = initDialog(activity);
-    builder.setCancelable(true);
     builder.setPositiveButton(R.string.accept,
         new DialogInterface.OnClickListener() {
           @Override
@@ -80,16 +80,17 @@ class Eula {
    * given the choice of accepting or declining the EULA -- we're simply
    * displaying it for them to read.
    */
-  static void showEula(Activity activity) {
-    AlertDialog.Builder builder = initDialog(activity);
+  static void showEula(Context context) {
+    AlertDialog.Builder builder = initDialog(context);
     builder.setPositiveButton(R.string.ok, null);
     builder.show();
   }
   
-  private static AlertDialog.Builder initDialog(Activity activity) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+  private static AlertDialog.Builder initDialog(Context context) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setCancelable(true);
     builder.setTitle(R.string.eula_title);
-    builder.setMessage(ResourceUtils.readFile(activity, R.raw.eula));
+    builder.setMessage(ResourceUtils.readFile(context, R.raw.eula));
     return builder;
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 0ae23e2c7..cfbab6d73 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -72,14 +72,13 @@ public class WelcomeActivity extends Activity {
   public void about() {
     LayoutInflater li = LayoutInflater.from(this);
     View view = li.inflate(R.layout.about, null);
-    final Activity activity = this;
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
     builder.setPositiveButton(R.string.ok, null);
     builder.setNeutralButton(R.string.license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
-        Eula.showEula(activity);
+        Eula.showEula(WelcomeActivity.this);
       }
     });
     builder.setIcon(R.drawable.arrow_icon);