diff --git a/ChangeLog b/ChangeLog
index 3ee6b845..31a6dc0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-11-19  Curtis Gedak  <gedakc@gmail.com>
 
+	* src/Win_GParted.cc: Fixed dangerous copy and paste problem.
+	  - Prevent a copied partition from being pasted into an existing
+	    partition.
+
 	* src/Win_GParted.cc: Added language length conditional Undo display.
 	  - If translated language is relatively long, then
 	      split the "Resize/Move" toolbar button text into two lines, and
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index a1cd8873..90483c38 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -896,7 +896,8 @@ void Win_GParted::set_valid_operations()
 		if ( ! copied_partition .get_path() .empty() &&
 		     copied_partition .get_length() <= selected_partition .get_length() &&
 		     selected_partition .status == GParted::STAT_REAL &&
-		     copied_partition != selected_partition )
+		     copied_partition != selected_partition &&
+		     selected_partition .type == GParted::TYPE_UNALLOCATED )
 		     allow_paste( true ) ;
 
 		//see if we can somehow check/repair this file system....