diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 47b1621..8a352ff 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 
 import org.ntlab.irisclient.entities.TurnJson;
 import org.ntlab.irisclient.viewmodels.GameViewModel;
@@ -29,7 +30,7 @@
     private int turnState = 0;//0:ヒント入力,1:カード選択
 
     //ヒントの情報
-    private String hint = "aaa";
+    private String hint = "a";
     private Integer hintMax = 0;
 
     @Override
@@ -133,7 +134,11 @@
             }
         });
 
-
+        //マスターなので推測終了ボタンを入力不可に設定
+        // ImageButton を無効にする
+        Button FinishGuessButton = (Button) findViewById(R.id.finishGuessButton);
+        FinishGuessButton.setEnabled(false);
+        //FinishGuessButton.setColorFilter(0xaaCCCCCC);
 
     }
 
@@ -186,11 +191,14 @@
         }
 
         //非アクティブであればヒントの入力を禁止する
+        EditText Hint = findViewById(R.id.GameHint);
+        EditText HintMax = findViewById(R.id.GameHintMax);
         if(isActive == false){
-            EditText Hint = findViewById(R.id.GameHint);
-            EditText HintMax = findViewById(R.id.GameHintMax);
             Hint.setFocusable(false);
             HintMax.setFocusable(false);
+        }else{
+            Hint.setFocusable(true);
+            HintMax.setFocusable(true);
         }
 
         return isActive;