diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 143841e..8ec2657 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -105,6 +105,7 @@ you are not actively using the program.\
     <string name="toggle_pgn_variations">Toggle Variations</string>
     <string name="toggle_pgn_comments">Toggle Comments</string>
     <string name="toggle_pgn_headers">Toggle Headers</string>
+    <string name="toggle_analysis">Toggle Engine Analysis</string>
     <string name="cancel">Cancel</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
@@ -501,6 +502,7 @@ you are not actively using the program.\
     <string-array name="button_action_texts">
         <item>Disabled</item>
         <item>Flip Board</item>
+        <item>@string/toggle_analysis</item>
         <item>@string/toggle_show_thinking</item>
         <item>@string/toggle_book_hints</item>
         <item>@string/toggle_pgn_variations</item>
@@ -510,6 +512,7 @@ you are not actively using the program.\
     <string-array name="button_action_values">
         <item></item>
         <item>flipboard</item>
+        <item>toggleAnalysis</item>
         <item>showThinking</item>
         <item>bookHints</item>
         <item>viewVariations</item>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 306e140..d8655b4 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -272,6 +272,22 @@ public class DroidFish extends Activity implements GUIInterface {
                     ctrl.prefsChanged();
                 }
             });
+            addAction(new UIAction() {
+                public String getId() { return "toggleAnalysis"; }
+                public int getName() { return R.string.toggle_analysis; }
+                public int getIcon(boolean large) { return -1; }
+                public boolean enabled() { return true; }
+                public void run() {
+                    int gameModeType = ctrl.analysisMode() ? GameMode.EDIT_GAME : GameMode.ANALYSIS;
+                    Editor editor = settings.edit();
+                    String gameModeStr = String.format("%d", gameModeType);
+                    editor.putString("gameMode", gameModeStr);
+                    editor.commit();
+                    gameMode = new GameMode(gameModeType);
+                    ctrl.setGameMode(gameMode);
+                    setBoardFlip(true);
+                }
+            });
         }
 
         @Override
diff --git a/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java b/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
index 83ad435..051be19 100644
--- a/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
+++ b/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
@@ -131,6 +131,11 @@ public class DroidChessController {
         }
     }
 
+    /** Return true if game mode is analysis. */
+    public final boolean analysisMode() {
+        return gameMode.analysisMode();
+    }
+
     /** Set engine book options. */
     public final synchronized void setBookOptions(BookOptions options) {
         if (!bookOptions.equals(options)) {