diff --git a/DroidFish/res/layout-land/main.xml b/DroidFish/res/layout-land/main.xml
index 76cde53..911524e 100644
--- a/DroidFish/res/layout-land/main.xml
+++ b/DroidFish/res/layout-land/main.xml
@@ -99,11 +99,14 @@
                 android:layout_above="@+id/scrollViewBot"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
-                <TextView
+                <EditText
                     android:id="@+id/moveList"
+                    android:tag="moveList"
                     android:layout_width="fill_parent" 
                     android:layout_height="wrap_content" 
                     android:includeFontPadding="true"
+                    android:editable="false"
+                    android:padding="0dp"
                     android:fontFamily="monospace"
                     android:typeface="monospace"
                     android:textSize="12sp"/>
diff --git a/DroidFish/res/layout/main.xml b/DroidFish/res/layout/main.xml
index ea6b708..981a6b0 100644
--- a/DroidFish/res/layout/main.xml
+++ b/DroidFish/res/layout/main.xml
@@ -93,11 +93,14 @@
             android:layout_above="@+id/scrollViewBot"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent">
-            <TextView
+            <EditText
                 android:id="@+id/moveList"
+                android:tag="moveList"
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content" 
                 android:includeFontPadding="true"
+                android:editable="false"
+                android:padding="0dp"
                 android:fontFamily="monospace"
                 android:typeface="monospace"
                 android:textSize="12sp"/>
diff --git a/DroidFish/res/layout/main_left_handed.xml b/DroidFish/res/layout/main_left_handed.xml
index c8a3fb9..619e6a7 100644
--- a/DroidFish/res/layout/main_left_handed.xml
+++ b/DroidFish/res/layout/main_left_handed.xml
@@ -94,11 +94,14 @@
                 android:layout_above="@+id/scrollViewBot"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
-                <TextView
+                <EditText
                     android:id="@+id/moveList"
+                    android:tag="moveList"
                     android:layout_width="fill_parent" 
                     android:layout_height="wrap_content" 
                     android:includeFontPadding="true"
+                    android:editable="false"
+                    android:padding="0dp"
                     android:fontFamily="monospace"
                     android:typeface="monospace"
                     android:textSize="12sp"/>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index e5a7de5..6a6d5d8 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -139,6 +139,7 @@ import android.widget.ImageView.ScaleType;
 import android.widget.ListView;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
 @SuppressLint("ClickableViewAccessibility")
@@ -1716,7 +1717,7 @@ public class DroidFish extends Activity implements GUIInterface {
 
     @Override
     public void moveListUpdated() {
-        moveList.setText(gameTextListener.getSpannableData());
+        moveList.setText(gameTextListener.getSpannableData(), BufferType.SPANNABLE);
         Layout layout = moveList.getLayout();
         if (layout != null) {
             int currPos = gameTextListener.getCurrPos();
diff --git a/DroidFish/src/org/petero/droidfish/Util.java b/DroidFish/src/org/petero/droidfish/Util.java
index 05fb849..d4f25c3 100644
--- a/DroidFish/src/org/petero/droidfish/Util.java
+++ b/DroidFish/src/org/petero/droidfish/Util.java
@@ -119,12 +119,13 @@ public final class Util {
         if (v == null)
             return;
         final int bg = ColorTheme.instance().getColor(ColorTheme.GENERAL_BACKGROUND);
+        Object tag = v.getTag();
         final boolean excludedItems = v instanceof Button ||
-                                      v instanceof EditText ||
+                                      ((v instanceof EditText) && !"moveList".equals(tag)) ||
                                       v instanceof ImageButton ||
-                                      "title".equals(v.getTag());
+                                      "title".equals(tag);
         if (!excludedItems) {
-            if ("drawer".equals(v.getTag()))
+            if ("drawer".equals(tag))
                 return;
             v.setBackgroundColor(bg);
         }