diff --git a/src/inputs/abstract.js b/src/inputs/abstract.js
index c1ad480..a50789c 100644
--- a/src/inputs/abstract.js
+++ b/src/inputs/abstract.js
@@ -189,7 +189,10 @@ To create your own input you can inherit from this class.
         inputclass: 'input-medium',
         //scope for external methods (e.g. source defined as function)
         //for internal use only
-        scope: null
+        scope: null,
+        
+        //need to re-declare showbuttons here to get it's value from common config (passed only options existing in defaults)
+        showbuttons: true 
     };
     
     $.extend($.fn.editabletypes, {abstractinput: AbstractInput});
diff --git a/src/inputs/date/date.js b/src/inputs/date/date.js
index 522836f..0620288 100644
--- a/src/inputs/date/date.js
+++ b/src/inputs/date/date.js
@@ -109,7 +109,7 @@ $(function(){
           this.$input.data('datepicker').date = null;
           this.$input.find('.active').removeClass('active');
           if(!this.options.showbuttons) {
-             this.$input.closest('form').submit(); 
+              this.$input.closest('form').submit(); 
           }
        },
        
diff --git a/src/inputs/datetime/datetime.js b/src/inputs/datetime/datetime.js
index da73e9d..458035a 100644
--- a/src/inputs/datetime/datetime.js
+++ b/src/inputs/datetime/datetime.js
@@ -129,7 +129,7 @@ $(function(){
        activate: function() {
        },
        
-       clear:  function() {
+       clear: function() {
           this.$input.data('datetimepicker').date = null;
           this.$input.find('.active').removeClass('active');
           if(!this.options.showbuttons) {
diff --git a/test/unit/date.js b/test/unit/date.js
index c4b1a09..ce3c9c2 100644
--- a/test/unit/date.js
+++ b/test/unit/date.js
@@ -152,7 +152,8 @@ $(function () {
         var d = '15.05.1984',
             e = $('<a href="#" data-type="date" data-pk="1" data-url="post-date-clear.php">'+d+'</a>').appendTo(fx).editable({
                 format: f,
-                clear: 'abc'
+                clear: 'abc',
+                showbuttons: true
             });
                        
           $.mockjax({
@@ -177,6 +178,7 @@ $(function () {
         //click clear
         clear.click();
         ok(!p.find('td.day.active').length, 'no active day');
+        ok(p.find('.datepicker').is(':visible'), 'datepicker still visible');
 
         p.find('form').submit();
     
diff --git a/test/unit/datetime.js b/test/unit/datetime.js
index 4dcbccc..5c15121 100644
--- a/test/unit/datetime.js
+++ b/test/unit/datetime.js
@@ -166,7 +166,8 @@ $(function () {
         var d = '15.05.1984 16:40',
             e = $('<a href="#" data-type="datetime" data-pk="1" data-url="post-datetime-clear.php">'+d+'</a>').appendTo(fx).editable({
                 format: f,
-                clear: 'abc'
+                clear: 'abc',
+                showbuttons: true
             });
                        
           $.mockjax({
@@ -191,6 +192,7 @@ $(function () {
         //click clear
         clear.click();
         ok(!p.find('td.day.active').length, 'no active day');
+        ok(p.find('.datetimepicker').is(':visible'), 'datetimepicker still visible');
 
         p.find('form').submit();