diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 5640dba8..0a68dcef 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -520,7 +520,7 @@ class DmsfFolder < ActiveRecord::Base
     # Attributes
     self.title = params[:dmsf_folder][:title].strip
     self.description = params[:dmsf_folder][:description].strip
-    self.dmsf_folder_id = params[:dmsf_folder][:dmsf_folder_id]
+    self.dmsf_folder_id = params[:parent_id]
     # Custom fields
     if params[:dmsf_folder][:custom_field_values].present?
       params[:dmsf_folder][:custom_field_values].each_with_index do |v, i|
diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb
index a75a9bb1..8fa49a48 100644
--- a/test/functional/dmsf_controller_test.rb
+++ b/test/functional/dmsf_controller_test.rb
@@ -281,4 +281,28 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     assert_response :success
   end
 
+  def test_create_folder_in_root
+    @role.add_permission! :folder_manipulation
+    @role.add_permission! :view_dmsf_folders
+    assert_difference 'DmsfFolder.count', +1 do
+      post :create, :id => @project.id, :dmsf_folder => {
+        :title => 'New folder',
+        :description => 'Unit tests'
+      }
+    end
+    assert_redirected_to dmsf_folder_path(:id => @project, :folder_id => nil)
+  end
+
+  def test_create_folder
+    @role.add_permission! :folder_manipulation
+    @role.add_permission! :view_dmsf_folders
+    assert_difference 'DmsfFolder.count', +1 do
+      post :create, :id => @project.id, :parent_id => @folder1.id, :dmsf_folder => {
+        :title => 'New folder',
+        :description => 'Unit tests'
+      }
+    end
+    assert_redirected_to dmsf_folder_path(:id => @project, :folder_id => @folder1)
+  end
+
 end
\ No newline at end of file