diff --git a/app/src/org/commcare/views/widgets/DateTimeWidget.java b/app/src/org/commcare/views/widgets/DateTimeWidget.java
index 6f85378519..60d73bf4d1 100644
--- a/app/src/org/commcare/views/widgets/DateTimeWidget.java
+++ b/app/src/org/commcare/views/widgets/DateTimeWidget.java
@@ -1,7 +1,6 @@
 package org.commcare.views.widgets;
 
 import android.content.Context;
-import android.os.Build;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.inputmethod.InputMethodManager;
@@ -39,6 +38,7 @@ public DateTimeWidget(Context context, FormEntryPrompt prompt) {
         mDatePicker.setFocusable(!prompt.isReadOnly());
         mDatePicker.setEnabled(!prompt.isReadOnly());
         mDatePicker.setCalendarViewShown(true);
+        mDatePicker.setSpinnersShown(false);
         updateCalendarViewHeight();
 
         mTimePicker = (TimePicker)LayoutInflater.from(getContext()).inflate(R.layout.time_widget, this, false);
@@ -97,6 +97,7 @@ private void updateCalendarViewHeight() {
         CalendarView calendarView = mDatePicker.getCalendarView();
         LayoutParams params = (LayoutParams) calendarView.getLayoutParams();
         params.height = LayoutParams.WRAP_CONTENT;
+        params.width = LayoutParams.WRAP_CONTENT;
         calendarView.setLayoutParams(params);
     }