diff --git a/postgres.go b/postgres.go
index b2624448..218d594d 100644
--- a/postgres.go
+++ b/postgres.go
@@ -66,7 +66,7 @@ func (s *postgres) PrimaryKeyTag(value reflect.Value, size int) string {
 }
 
 func (s *postgres) ReturningStr(tableName, key string) string {
-	return fmt.Sprintf("RETURNING \"%v\".%v", tableName, key)
+	return fmt.Sprintf("RETURNING %v.%v", s.Quote(tableName), s.Quote(key))
 }
 
 func (s *postgres) SelectFromDummyTable() string {
@@ -97,7 +97,7 @@ func (s *postgres) HasColumn(scope *Scope, tableName string, columnName string)
 }
 
 func (s *postgres) RemoveIndex(scope *Scope, indexName string) {
-	scope.Raw(fmt.Sprintf("DROP INDEX %v", indexName)).Exec()
+	scope.Raw(fmt.Sprintf("DROP INDEX %v", s.Quote(indexName))).Exec()
 }
 
 var hstoreType = reflect.TypeOf(Hstore{})