diff --git a/samples/ApiDemos/res/layout/keystore_usage.xml b/samples/ApiDemos/res/layout/keystore_usage.xml
index 2bf784555..bfaac7cd6 100644
--- a/samples/ApiDemos/res/layout/keystore_usage.xml
+++ b/samples/ApiDemos/res/layout/keystore_usage.xml
@@ -83,12 +83,12 @@
 
         <EditText
             android:id="@+id/plaintext"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@+id/plaintext_label"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/key_ops_header"
-            android:layout_toRightOf="@id/plaintext_label"
+            android:layout_toRightOf="@+id/plaintext_label"
+            android:layout_marginBottom="12dp"
             android:ems="10"
             android:maxLines="1" />
 
@@ -102,12 +102,12 @@
 
         <EditText
             android:id="@+id/ciphertext"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@+id/ciphertext_label"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/plaintext"
-            android:layout_toRightOf="@id/ciphertext_label"
+            android:layout_toRightOf="@+id/ciphertext_label"
+            android:layout_marginBottom="12dp"
             android:maxLines="1" />
 
         <LinearLayout
@@ -189,4 +189,4 @@
             android:ems="10" />
     </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/security/KeyStoreUsage.java b/samples/ApiDemos/src/com/example/android/apis/security/KeyStoreUsage.java
index 901806ac5..885bf4dd9 100644
--- a/samples/ApiDemos/src/com/example/android/apis/security/KeyStoreUsage.java
+++ b/samples/ApiDemos/src/com/example/android/apis/security/KeyStoreUsage.java
@@ -129,6 +129,7 @@ public class KeyStoreUsage extends Activity {
         ListView lv = (ListView) findViewById(R.id.entries_list);
         mAdapter = new AliasAdapter(getApplicationContext());
         lv.setAdapter(mAdapter);
+        lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         lv.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -250,6 +251,8 @@ public class KeyStoreUsage extends Activity {
      * enabled or disabled.
      */
     private void setKeyActionButtonsEnabled(boolean enabled) {
+        mPlainText.setEnabled(enabled);
+        mCipherText.setEnabled(enabled);
         mSignButton.setEnabled(enabled);
         mVerifyButton.setEnabled(enabled);
         mDeleteButton.setEnabled(enabled);