2 files changed, 16 insertions, 1 deletions
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
index a8717c1aa..393a854cf 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -43,7 +43,14 @@ public class LexicalEntryActivity extends ListActivity {
 
 	    updateTranslations();
       }
-	
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		mShowLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage());
+	}
+
 	private void updateTranslations() {
 	    @SuppressWarnings("unchecked")
 		List<MorphoAnalysis> list = (List<MorphoAnalysis>)
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
index c312d7aad..9efd841f1 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
@@ -106,6 +106,14 @@ public class MainActivity extends Activity {
         });
     }
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		mSourceLanguageView.setSelectedLanguage(mTranslator.getSourceLanguage());
+		mTargetLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage());
+	}
+
     @Override
     protected void onDestroy() {
         if (mAsr != null) {