diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index b91d67d..1092961 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -347,8 +347,9 @@ $.extend(Timepicker.prototype, {
 					});
 				});
 			}
-				
-			if (this._defaults.showButtonPanel) $dp.find('.ui-datepicker-buttonpane').before($tp);
+
+			var buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+			if (buttonPanel.length > 0) $dp.find('.ui-datepicker-buttonpane').before($tp);
 			else $dp.append($tp);
 			
 			this.$timeObj = $('#ui_tpicker_time_'+ dp_id);