diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 539dcd9..cd467d2 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -36,7 +36,7 @@ class RepositoriesController < ApplicationController
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
 
   def new
-    scm = params[:repository_scm] || Redmine::Scm::Base.all.first
+    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
     @repository = Repository.factory(scm)
     @repository.is_default = @project.repository.nil?
     @repository.project = @project
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 817e16e..6bcbb6b 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -43,6 +43,22 @@ class RepositoriesControllerTest < ActionController::TestCase
     assert_tag 'input', :attributes => {:name => 'repository[url]'}
   end
 
+  def test_new_should_propose_enabled_scm_only
+    @request.session[:user_id] = 1
+    with_settings :enabled_scm => ['Mercurial', 'Git'] do
+      get :new, :project_id => 'subproject1'
+    end
+    assert_response :success
+    assert_template 'new'
+    assert_kind_of Repository::Mercurial, assigns(:repository)
+    assert_tag 'select', :attributes => {:name => 'repository_scm'},
+      :children => {:count => 3}
+    assert_tag 'select', :attributes => {:name => 'repository_scm'},
+      :child => {:tag => 'option', :attributes => {:value => 'Mercurial', :selected => 'selected'}}
+    assert_tag 'select', :attributes => {:name => 'repository_scm'},
+      :child => {:tag => 'option', :attributes => {:value => 'Git', :selected => nil}}
+  end
+
   def test_create
     @request.session[:user_id] = 1
     assert_difference 'Repository.count' do