diff --git a/middleman-core/features/partials.feature b/middleman-core/features/partials.feature
index dfc2950e..d039bdcb 100644
--- a/middleman-core/features/partials.feature
+++ b/middleman-core/features/partials.feature
@@ -12,6 +12,11 @@ Feature: Provide Sane Defaults for Partial Behavior
     Then I should see "Header"
     And I should see "Footer"
 
+  Scenario: Finds shared partials without _ prefix
+    Given the Server is running at "partials-app"
+    When I go to "/using_snippet.html"
+    Then I should see "Snippet"
+    
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/index.html"
diff --git a/middleman-core/fixtures/partials-app/source/shared/_footer.erb b/middleman-core/fixtures/partials-app/source/shared/_footer.erb
index 763283eb..e749891c 100644
--- a/middleman-core/fixtures/partials-app/source/shared/_footer.erb
+++ b/middleman-core/fixtures/partials-app/source/shared/_footer.erb
@@ -1 +1 @@
-%footer Footer
\ No newline at end of file
+<footer>Footer</header>
\ No newline at end of file
diff --git a/middleman-core/fixtures/partials-app/source/shared/snippet.erb b/middleman-core/fixtures/partials-app/source/shared/snippet.erb
new file mode 100644
index 00000000..21966d74
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/shared/snippet.erb
@@ -0,0 +1 @@
+Snippet
\ No newline at end of file
diff --git a/middleman-core/fixtures/partials-app/source/using_snippet.html.erb b/middleman-core/fixtures/partials-app/source/using_snippet.html.erb
new file mode 100755
index 00000000..bf6fca6b
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/using_snippet.html.erb
@@ -0,0 +1 @@
+<%= partial "shared/snippet" %>
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
index abadb725..f0f314f6 100644
--- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
@@ -123,7 +123,7 @@ module Middleman::CoreExtensions::Rendering
       engine        = nil
 
       # If the path is known to the sitemap
-      if resource = sitemap.find_resource_by_destination_path(current_path)
+      if resource = sitemap.find_resource_by_path(current_path)
         current_dir = File.dirname(resource.source_file)
         engine = File.extname(resource.source_file)[1..-1].to_sym
 
@@ -132,23 +132,23 @@ module Middleman::CoreExtensions::Rendering
           relative_dir = File.join(current_dir.sub("#{self.source_dir}/", ""), data)
 
           # Try to use the current engine first
-          found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine)
+          found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true)
 
           # Fall back to any engine available
           if !found_partial
-            found_partial, found_engine = resolve_template(relative_dir)
+            found_partial, found_engine = resolve_template(relative_dir, :try_without_underscore => true)
           end
         end
       end
       
       # Look in the root for the partial with the current engine
       if !found_partial && !engine.nil?
-        found_partial, found_engine = resolve_template(data, :preferred_engine => engine)
+        found_partial, found_engine = resolve_template(data, :preferred_engine => engine, :try_without_underscore => true)
       end
 
       # Look in the root with any engine
       if !found_partial
-        found_partial, found_engine = resolve_template(data)
+        found_partial, found_engine = resolve_template(data, :try_without_underscore => true)
       end
 
       # Render the partial if found, otherwide throw exception
@@ -340,10 +340,20 @@ module Middleman::CoreExtensions::Rendering
 
         # Look for files that match
         path_with_ext = on_disk_path + "." + preferred_engine
+        
         found_path = Dir[path_with_ext].find do |path|
           ::Tilt[path]
         end
         
+        if !found_path && options[:try_without_underscore] && 
+          path_no_underscore = path_with_ext.
+            sub(relative_path, relative_path.sub(/^_/, "").
+            sub(/\/_/, "/"))
+          found_path = Dir[path_no_underscore].find do |path|
+            ::Tilt[path]
+          end
+        end
+        
         # If we found one, return it and the found engine
         if found_path || (File.exists?(on_disk_path) && !File.directory?(on_disk_path))
           engine = found_path ? File.extname(found_path)[1..-1].to_sym : nil