diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
index d5aa9af1..4617dfcd 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
@@ -3,6 +3,7 @@ package com.nutomic.syncthingandroid.activities;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.widget.ShareActionProvider;
 import android.util.Log;
 import android.view.Menu;
@@ -46,7 +47,7 @@ public class LogActivity extends SyncthingActivity {
 
         if (savedInstanceState != null) {
             mSyncthingLog = savedInstanceState.getBoolean("syncthingLog");
-            invalidateOptionsMenu();
+            ActivityCompat.invalidateOptionsMenu(this);
         }
 
         mLog = (TextView) findViewById(R.id.log);
diff --git a/src/main/res/layout/log_activity.xml b/src/main/res/layout/log_activity.xml
index a355d0bb..db921b83 100644
--- a/src/main/res/layout/log_activity.xml
+++ b/src/main/res/layout/log_activity.xml
@@ -17,7 +17,7 @@
             android:textSize="10sp"
             android:textIsSelectable="true"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
+            android:layout_height="wrap_content" />
 
     </ScrollView>