diff --git a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml
index 6439b49acc9d5..2749aa668ddbd 100644
--- a/packages/PrintSpooler/res/layout/printer_dropdown_item.xml
+++ b/packages/PrintSpooler/res/layout/printer_dropdown_item.xml
@@ -37,7 +37,8 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:duplicateParentState="true">
 
         <TextView
             android:id="@+id/title"
diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
index 7f9be6ce702a5..0bd8344d5b3d3 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
@@ -555,6 +555,7 @@ public class PrintJobConfigActivity extends Activity {
                 // TODO: We need some UI for announcing an error.
                 mControllerState = CONTROLLER_STATE_FAILED;
                 Log.e(LOG_TAG, "Received invalid pages from the app");
+                mEditor.cancel();
                 PrintJobConfigActivity.this.finish();
             }
         }
@@ -1152,6 +1153,9 @@ public class PrintJobConfigActivity extends Activity {
                     if (!mFavoritePrinterSelected && mDestinationSpinnerAdapter.getCount() > 2) {
                         mFavoritePrinterSelected = true;
                         mDestinationSpinner.setSelection(0);
+                        // Workaround again the weird spinner behavior to notify for selection
+                        // change on the next layout pass as the current printer is used below.
+                        mCurrentPrinter = (PrinterInfo) mDestinationSpinnerAdapter.getItem(0);
                     }
 
                     // If there is a next printer to select and we succeed selecting
diff --git a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
index b8a9417a2faa7..20315caae650a 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
@@ -435,6 +435,8 @@ public final class SelectPrinterFragment extends ListFragment {
                         R.layout.printer_dropdown_item, parent, false);
             }
 
+            convertView.setEnabled(isEnabled(position));
+
             CharSequence title = null;
             CharSequence subtitle = null;
             Drawable icon = null;
@@ -475,6 +477,12 @@ public final class SelectPrinterFragment extends ListFragment {
             return convertView;
         }
 
+        @Override
+        public boolean isEnabled(int position) {
+            PrinterInfo printer =  (PrinterInfo) getItem(position);
+            return printer.getStatus() != PrinterInfo.STATUS_UNAVAILABLE;
+        }
+
         @Override
         public Loader<List<PrinterInfo>> onCreateLoader(int id, Bundle args) {
             if (id == LOADER_ID_PRINTERS_LOADER) {