diff --git a/lib/carrierwave.rb b/lib/carrierwave.rb
index a75f727fc..9e6129965 100644
--- a/lib/carrierwave.rb
+++ b/lib/carrierwave.rb
@@ -103,13 +103,17 @@ class Railtie < Rails::Railtie
   end
 
 elsif defined?(Sinatra)
-
-  CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
-    # Sinatra >= 1.3
-    Sinatra::Application.public_folder
+  if defined?(Padrino)
+    CarrierWave.root = File.join(PADRINO_ROOT, "public")
   else
-    # Sinatra < 1.3
-    Sinatra::Application.public
+
+    CarrierWave.root = if Sinatra::Application.respond_to?(:public_folder)
+      # Sinatra >= 1.3
+      Sinatra::Application.public_folder
+    else
+      # Sinatra < 1.3
+      Sinatra::Application.public
+    end
   end
 
 end