diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java
index 3918ae011..edc42cb79 100644
--- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java
+++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java
@@ -18,6 +18,7 @@
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.app.TimePickerDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -25,6 +26,7 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -177,6 +179,8 @@ public void onTimeSet(TimePicker view, int hour, int minute) {
             }
         };
 
+        Context context = new ContextThemeWrapper(getActivity(), R.style.dayNightTimePickerDialogTheme);
+
         final DatePickerDialog.OnDateSetListener dateCallback = new DatePickerDialog.OnDateSetListener() {
 
             @Override
@@ -196,7 +200,7 @@ public void onDateSet(DatePicker view, int year, int monthOfYear,
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                    new DatePickerDialog(view.getContext(), dateCallback, mMyCalendar
+                    new DatePickerDialog(context, dateCallback, mMyCalendar
                             .get(Calendar.YEAR), mMyCalendar.get(Calendar.MONTH),
                             mMyCalendar.get(Calendar.DAY_OF_MONTH)).show();
                 }
@@ -209,7 +213,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
-                    new TimePickerDialog(view.getContext(), timeCallback,
+                    new TimePickerDialog(context, timeCallback,
                             mMyCalendar.get(Calendar.HOUR_OF_DAY),
                             mMyCalendar.get(Calendar.MINUTE), false).show();
                 }
diff --git a/onebusaway-android/src/main/res/values/themes.xml b/onebusaway-android/src/main/res/values/themes.xml
index dd73e5d7d..4e28336c3 100644
--- a/onebusaway-android/src/main/res/values/themes.xml
+++ b/onebusaway-android/src/main/res/values/themes.xml
@@ -25,5 +25,14 @@
         <item name="autoCompleteTextViewStyle">@style/cursorColor</item>
         <!-- Allows us to force Dark Theme throughout the app -->
         <item name="android:forceDarkAllowed">true</item>
+
     </style>
+
+    <!-- Custom TimePickerDialog theme for dark mode -->
+    <style name="dayNightTimePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog">
+        <item name="colorPrimary">@color/theme_primary</item>
+        <item name="colorPrimaryDark">@color/theme_primary_dark</item>
+        <item name="colorAccent">@color/theme_accent</item>
+    </style>
+
 </resources>
\ No newline at end of file